Apple replaced the motherboard in my MacBook Pro, because of the heat issue. Which may be related to your MB heat problem.
In addition to the motherboard replacement, I added Fan Control, great little program.
I also bought a laptop stand with a built in fan. Never had a heat problem since.