Welp, I bit the bullet and ordered a 17" MacBook Pro last night. If the new MBPs are something I can't live without, I'll lose a little money by selling, and pick one up.
It's a blowout from MacMall (used the AI 3% discount), and it worked out to $1840 shipped for the specs below. I feel like it's a great price, and that I'll only lose 15-20% if I sell in 5-6 months.
2.3 Ghz i7
750 GB Hard Drive
Anti-Glare
4 GB RAM
I'll be using it for video editing and photo editing, so I'll be throwing 16 GB RAM in as soon as possible. I feel a little sick about buying with the new ones on the horizon, but duty calls.