How to correctly nerf and buff a civ

I agree.

Then I would put in an upgrade that increases the limit, like Chinese villages. For Japanese and Swedish.