Thanks for your input !
Indeed that seems to be a good idea !
Concerning the claims on already owned territory, it was the way the game was originally planned, but it ended up creating very weird and confusing maps with a lot of tiny exclaves due to the way the game processes the IA and the end turn.