Now, based on these, it would be legal for a Queen (or Bishop) on g6, as illustrated below, to move to either h5 or 5. Is this correct?
That is absolutely correct. The move possibilities of the queen are shown completely.
After the discussion at that time I have adapted my description. In summary it says:
Finally, you can move into a switch from below, from the side or from above. If the switch is not occupied, then you can choose whether the piece that moves into the switch is on 4 or a4 respectively on 5 or h5 after the move. If the switch is occupied, then the piece in the switch must be captured; the opponent’s piece takes the place of the captured piece.
That is absolutely correct. The move possibilities of the queen are shown completely.
After the discussion at that time I have adapted my description. In summary it says: