Have you played the game with the Gods and Kings expansion Smooth? It has DRASTICALLY fixed the end game already and Brave New World is going to just add to that even more.