Pro, definitely
It is what you REALLY want, judging by your post. If you get a MB, you'll never be happy with it and always think "How it would be to own a Pro..." etc
Not to mention the Pro has soooo much stuff that makes it a far superior to the MB!
(From my experience: I was given a MB for my birthday, although I wanted a Pro, I thought it was still fine and I'm really greatful for this present. Ever since, the longer I had it, the more I wanted either a Pro, or the last gen G4 PowerBook (basically same case, KB, display). Now that my iMac will soon need to be replaced by something newer, I'm lost between getting a new iMac OR selling this MB and getting a MBP (new or used). Morale of the story: get something you really want, otherwise you'll end up regretting your decision)
I tend to agreed, I was disappointed in the screen size and lack of a good video card when I bought my white MB in the winter of 2006. I sold it and bought a MBP in the summer of 2007. Now I've never had a problem with my MBP and I play games in bootcamp (Windows) when I'm not work in OS X.
However, I'm surprised no one mentioned this looming nVidia 8600 issue. With all the uncertainty as to which systems are or will be impacted, should we recommend buying a MBP now (other than perhaps used/refurb systems containing ATI x1600 cards)? Wouldn't this be particularly true in light of the impending Mac upgrades purportedly due next month?
Should this be a factor in his decision?