Get the MBP if you want to truly be happy with your laptop. It's not just the specs, it's the build quality on those things. The MacBooks (the black ones anyway, I can't speak for the white ones because I didn't own one) has a shoddy build. It looks nice at first, but they get blemished, scratched and dirty sooo easy... and the dirt isn't the kind that wipes off. The keyboard and trackpad wears away so easily, and the casing slowly comes apart at the seams. It didn't fall off or anything but if you press on it, it squeaks and you can feel it bending in. And I'm not saying you have to press hard at all.
And the glossy screen! People have different opinions on those, but I hate them. I hate them because I watch DVDs on the laptop often (yes, it's ironic how the glossy screens are advertised to be good for movie viewing... let me tell you, it's not). The viewing angles is horrible, and especially on dark scenes on DVDs you can see the weak viewing angle so obviously it's not funny. Move your head and the colors morph so! A matte screen has none of that. I know it's because of the gloss, because I used to own an old G3 (not G4) iBook, and DVDs look better on that thing than the MacBook.
Sounds like you had a pretty bad experience with your Blackbook, and I'm sorry to to hear that. My own Blackbook has been apparently the complete opposite of yours.
The build quality is first-rate, better than any other laptop I've handled, including the MBP (not that there's ANYTHING wrong with current MBP build quality). Solid, reliable, takes a serious lickin'!
As far as the glossy screen, I cannot understand the "issues" folks have with it. I can't even tell it's glossy unless I'm at just a few degrees off parallel with it; everything is sharp, clear, and vibrant, with not a single distraction or reflection taking away from my ability to view anything, in any light, at any brightness or contrast.
The trackpad is so superior to the Dells and Toshibas and HPs I've used in the last eight years, I'm actually amazed I like to use it. Keys and buttons are quiet but positive and firm, fit & finish overall is the best I've ever seen, and quite honestly I'm glad I didn't spend an extra $500 or so for specs that are (for me, anyway) of dubious necessity.
My advice would be to get the unit that appears, based on needs, to come closest to meeting them, while holding on to the receipts and packaging, and wring the hell out of it for ten days. If you have any doubt at that point, get it back to Apple quick and try again.