Yes, I think the swap version would make it more fair, and yes, the restriction on the second player's first move MUST be included if this version is to be implemented.
(hide) If you want to find out more about some games you can check the links section and see if you find any interesting links there. (pauloaguia) (show all tips)