I don't know about the Macbooks, but I know for a fact the Pro models are supply constrained and have been since they launched.

I think if they fix the heat issues you'll be glad you were made to wait a little longer. One of the reasons I'm holding off on the purchase of a 17" MBP is in hopes Apple will get their stuff together and make some revisions in the next month or so. Waiting until I launch my new site and start bringing in a little bit of income doesn't hurt either.

Bruno