I say square. But it would be really cool of you coups visit the moon and sun too. The moon being a desert/clay like landscape and the sun lava with little pieces of red ground (e.g. Netherrock). If they are square this could make these places even more interesting. And you can get there by portals or making stairs or something which will only be available ar certain times of the day.