Concerning the game started with the king/queen reversal:
Rule 11F
Before or during move 10, the game is restarted.
After move 10, the game continues.
after move 10
This, by its statement that the game continues implies that the original position of the pieces at the start of the game shall be considered as if it were legal, at least for the purpose of this game.
Concerning allowing players to correct the king and queen within the course of the game:
By the above rule, it is illegal to switch the queen and the king in a game that is in progress. That, in itself, constitutes an illegal move.
If, in following rule 11H, you as a director, intervene if you witness an illegal move, then you must intervene in this case. On that intervention, you must apply the rule as written (restart if move 10 is not complete, continue with the position before the switch if after move 10.)
If you use the alternate rule 11H1, you ignore the switch as you would ignore any other illegal move and only get involved if one of the players brings it to your attention.
You must be consistant throughout the event, and treat this as any other illegal move witnessed.
And you should never allow (by ruling) a switch of the king and queen during the course of the game, even if both players agree.
about castling being legal:
let us examine the rules as written:
8A2: Castling is a move of the king and either rook, counting as a single move and executed as follows: the king is transferred from its original square two squares toward either rook on the same rank; then that rook is transferred over the king to the square adjacent to the king on the same rank.
comment:
“The king is transferred from its original square…”
There is nothing said about the king being on a particular square (e1 or d1 for white). Its original square is the square on which it rested at the commencement of the game.
“… two squares toward either rook on the same rank.”
No actual squares are named. As long as this procedure is followed, the castle is legal.
8A3 Castling permanently illegal. Castling is permanently illegal for the remainder of the game for a player: a. if that player’s king has already moved, or with the rook of the player has already moved.
comment:
If the king has not yet moved in the game, even if it is on the “wrong” square, condition 8A3a does not exist, therefore castling is not permanently illegal.
The rule is clear.
Castling is legal, as long as all other conditions are met, and the procedure for castling is carried out according to the rule (e.g. Kd1-b1 or Kd1-f1)