Points? You mean Combat Strength and Range Combat Strength? If so, then I suggest not to manually meddle with Base CS. Just use promotion, that’s what they are there for.
We already use a unit using this mechanic of having bonus CP instead of bonus CS : the Assyrian Iron Chariot has a base CP of 13, but gets 2 bonus CP if you have less IChariot than the number of Iron and Horse available (the two Strategic resources are taken separately into account, so the IChariot can gain 4 CP, becoming a 17 CP unit). It is a way to play with strategic resource availability : to be at its peak of power, this unit requires two strategic resources, but you can still use all your strategic resources for commerce or other units without forbidding the IChariots to heal : they'll just become a bit weaker.
I really like the way this unit feels right now : with its CP bonus and its "Fury of Nergal" promotion, which counters flanking tactics, this unit can be frigthening, but it suffers from the "rough terrain penalty", which hinders its mobility and ability to retreat (the Celtic Scythed Chariot at least has the "Slipstream" ability to avoid being caught), and, if you create too much IChariot, they'll become weaker than normal Horsemen. A really unique unit which, behind its apparent overpowering forces, has weakness which can catch you off-guard.
The Spanish Armada will also have some clear strength and weaknesses : it's extreme strength in naval combat is counterbalanced by its lack of mobility, its high cost, and the fact it must be at full health to benefit from most of its unique bonus means that, in a war of attrition, it won't be as useful as a Sea Beggar (and will be crushed by English Ships of the Line => nice reference). To use this unit well, you must create the conditions where it can use its brute force without fear (although the Spanish UA can help you create Armadas, their cost is still prohibitive).
@pineappledan, you didn't add my proposition for the Japanese UB2 to the poll (specific yield for each type of guild within the empire). You didn't like it ?
For the Indian UB2, I can't be sure right now if it's too powerful or not : I was in an extremely favorable position for putting farms everywhere (which I did), and, with a Tradition capital, this UB had quite a significant effect, but I didn't pay much attention to the effect of the building in my minor cities...
Question : How is calculated the culture bonus ? Before or after the modifiers (since India has huge food modifiers, this can play a lot). ?