Coming from Vox Populi mod, they have a simple solution to the problem above : 1UPT is kept for military only. You can have as much civilians packed under any military, and they can share tiles with other civilizations as well.
Won't solve the problem with allies blocking your soldiers though.