Un-Nerf Religous Party and Federation

The las two changes that made me furious were the balancing nerves that punish playing wide.

It's already annoying to get to saints and sinners at a not fast speed (I mostly play on normal), but now it's even useless, no matter if you just wanted to make a heavy industry on those burning gas planets or try to colonoze the entire galay, +20 doesn't help much, at least make a minimum of 20 to prevent revolutions...

As for the Federation part, it's completely unstable and unpredictable if you have evenly distributed votes between the partys, so that bonus is nearly useless now. Please make it at least so that it doesn't look for party but instead if they're assigned to systems as someone else suggested at a different idea about rebalancing the Federation (1st comment). This would thematically make sense and still provides a limitation that's not ugly unstable like the current atempt.

As for now, because I fill system improvement level 3 & 4 with tier 3 resources and set them to rare (I want strategic  & luxury resources to be truely valuable), the only way to realistically control every system (my actual goal in every game and the reason why I deactivate every way to win) is to play Hissho as Keii is (hopefully still not nerfed) not affected by colonisation limit...

ps. happiness counts as economy, right? (about the category tags)