Yeah, me too.
I'm looking at the same decision, except I'm looking at both models on craigslist today.
The mbp has a 2.2, 7200 rpm 200gig hd, and 128 meg graphics, 4 gigs of ram, and comes with an encase bag and keyboard cover. It's eligible for either applecare or the best buy warranty.
The new mb was bought by a college kid a couple of days ago, and he decided he didn't like the Mac OS. It's the entry level new macbook
I can get either today for $1300, and I've got a pretty tough choice to make. I entered a thread this morning before I saw yours.
Considering my needs, I'm considering the mb even though its less of a savings (Basically, I won't be paying sales tax.) because of portability, no need for firewire, the new design, more of an initial warranty, and cheaper applecare on the macbook.
OTOH, the mbp has the bigger screen, (slightly) larger hard drive and non-integrated graphics (though with less video ram). It also comes with a case and keyboard cover. Both, IMHO, are excellent deals. I'm just not sure which way to go.