I had a lot of these thoughts too, and you've summarized the pros and cons of waiting very well.
For me, it came down to the fact that I wanted a light and thin laptop. My MBA (at 2.9 lbs) is probably where the new MBP is gonna be, since Apple is still constrained by the need for a fan and a larger battery for the larger screen. So, since it wasn't going to be really near the 2lb mark, and I have absolutely no need for extra ports or the power of a MBP, I just figured I'd spring for the rMB.
I went m7/512 (since I have 240gb currently on my 2011 MBA excluding my movies/tv shows), and the m7 for the heck of it.
[now, if Apple pulls a rabbit out of their hat, then maybe I'll sell the rMB used to someone for a loss and just jump ship, but I doubt it'll sway me.]