I may have an excellent solution!
I ordered one of these as a last try before I revert to stock:
https://www.mishimoto.com/race...igh-flow-fan-10.html
Fits perfectly in in the hole and the height is perfect. All I have to do is drill 4 holes and make some mounting posts.
I'll post my progress.
Air flow throw this thing is ridiculous.