I got a private dedicated server where I have built a village on the border of entity processing spawn chunks/lazy processing chunks and golems are spawning way too much...

I got maybe 40-50 villagers but also around 60-70 iron golems at a time sometimes.
There was an issue on this tracker before where iron golems would spawn too much, but I think in this case it might be that the village is on an entity spawn/lazy chunk border (such that the iron golems wander outside of entity processing chunks and villagers cant find them anymore). The straight cobblestone fence in the screenshots show the border.

Maybe there should be an iron golem mob cap applied within a certain radius?

It's getting old killing them off each time, and I'm getting tired of the lag this is causing...