Another idea would be to select "just a few turns more" after you fulfilled a victory condition. Last game I had my last opponent surrender and I would have liked very much to complete the master quest just for fun, but the game ended due to no opponent left.
Or is something like that already ingame?