30PSI at 4000RPM is good, however, you have already fixed the other obvious parts of the cooling system. I would replace the impeller, gaskets, and housing and see if it gets better.
If overheat still persists, you will need to look for other causes like clogged water passages, compression...