Apple helps me out by limiting options

Looks like Apples recent upgrade of the MacBook Pro line helped answer the questions I had in regards to buying a MBP :

Now, the purchase is pretty much a no-brainer, and a 2.33GHz 15" MBP should be heading my way the coming weeks.

Huge thanks to all those who took the time advising me about what options to get.