Keep my Hero or get the Moment?

[Munkee915]

I switched from my Diamond to the Hero on 10/11 and havent looked back since. I am absolutely in LOVE w/ android! My curse is that i work for Best Buy, and in talking to my buddy in the mobile dept, i found out about the Samsung Moment coming out next week. a quick run of the specs, and im really considering switching out again. I'm still within my 30 days so they will do the swap in the store w/o an issue, but im really debating. heres my thinking:

Pros (reasons to switch):
800mhz processor
AMOLED screen w/ more colors
hardware keyboard (i still miss the keyboard from my mogul)
LED flash (again, i miss the flashlight app from my mogul, not really for pics)
touchpad "trackball"
vanilla android (this may not seem like a pro, but from what i've read, the hope is that it will upgrade to 1.6 or 2.0 easier since theres no need to rewrite SenseUI for the update)

Cons (stopping me from switching):
Weaker camera
No digital compass? (from what i'm reading)
No multi-touch (yet, i know the hero multi was really just an HTC hack)
No sense UI (mostly the loss of 7 screens, and the enhanced contacts)
convenience (i love new phones, i hate setting them up)
i can get $50 back on my Hero this week, the moment will be the same price as what i paid for my hero 3 weeks ago so its an even swap

im telling myself 2.0 will come out soon enough and i will get multi touch back (i hope), and somone will hack SenseUI as well (saw it on my friends G1 last week, buggy, but there). the camera is not that big of an issue. I mean, its a phone, if i want to take nice pics, i'll stick to my DSLR. But i really miss my hardware keyboard ever since switching to the diamond last year. And I guess i'm really debating if the processor will make enough of a difference to pass up on getting $50 back on my hero.

Thoughts?