Yep, the MOO2 system was great. However, now that each civ/leader has their own unique bonuses (no more generic mix-and-match with Financial, Philosophical, etc), if they offer Unrestricted Leaders then you will be able to do quite a quite a bit of mixing-and-matching for some pretty creative...