You mentioned that it only went up to 130 degrees without the thermostats - during cooler weather. This got me to thinking a bit . . .
If it was mine, before I'd start trying all sorts of things, I'd pull the thermostats and see what temps it runs at on hot days with no thermostats. If it can maintain a good temp at idle on hot days, then you know your system has the cooling capacity to handle the heat.
You need to know that the system can handle the engine's cooling requirements - before you start changing things.
Once you've proven this, then you may want to look at your thermostats and potentially the amount of restriction they bring into the system --- maybe there is an issue there? I've never ran 21 stud engines with head-mounted water pumps, so I have no practical experiences to share - but I always try to work from a baseline situation (removing as many variables as possible) - when looking for answers to hard problems.
Best of luck!