Waiting for a new model or a new underlying architecture also means dealing with first generation APple problems. Trust me, with Apple you want to buy at the END of a model cycle - when most of the issues have been dealt with. The first generation is beautiful before you switch it on, but then it makes you bitter as you have to send it in all the time or learn to live with the defects.
Not that the current MBPs don't have issues, but a new line will be much worse. Don't wait, just buy and use.