A fan on the PSU/MB wall pointing towards the MB might help your overheat situation. Just a thought
While I agree with Isaac on the top I think your present solution is cooler

It's a bit much empty space in it for my liking but it's neat anyway
The stock cooler really, really has to go