How to conclude long "whether ... or" clauses

I have found that the form "whether this or that" does not work so well in long sentences. Intuitively, it seems that putting an "if" after the "or" makes it flow better, but is that grammatically correct?

Example:

There is some confusion as to whether it is necessary for all of the board members to be present when the meeting is called to order and the agenda is read, or if a majority is sufficient.

Solution 1:

Looking at Google books, "or if" generally follows an initial "if", and "or whether" generally follows an initial "whether". I would suggest:

There is some confusion as to whether it is necessary for all of the board members to be present when the meeting is called to order and the agenda is read, or whether a majority is sufficient.

Solution 2:

If you’re concerned about the sentence being too long, then break it down into two sentences. For example:

‘There is some confusion as to whether or not it is necessary for all of the board members to be present when the meeting is called to order and the agenda is read. A majority may be sufficient.’