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.
(gem) Hvis du vil hilse på nogen, på deres eget sprog så prøv vores "spiller ordbog" under "mere om sprog" linket under flagene. (pauloaguia) (vis alle tips)