Topkapi Palace needs to be redone. It gives you a 20% chance to build your vassals unique unit. Does this mean a chance to build one of the cultural units that your vassal can build? Instead you can just insist that your vassal trade you that culture so you can build them yourself, so the Topkapi bonus does not seem to make sense.
If you use the option of no ZOC then Strategic Command needs to be disabled as well, it becomes an empty GG promotion, but it is still a prerequisite for following promotions.
Still trying to come up with ideas to curb rampant money, can all promotions be made to cost money to be taken? Perhaps differing amounts for different ones? This represents the time and money required to train the unit in the new promotion. Even the "free" promotions buildings give. Base the cost on the era of the unit as well as the promotion. It would cost more to give combat 1 to a Medieval unit than to an Ancient one. After all, it costs to upgrade a unit, makes sense it would cost to promote them too. This can become VERY costly if you take the trait Charismatic and every one of your 500 unit army now has another promotion coming.