This choice is killin' me. I've had an upgrade available for a few weeks now and I cannot pull the trigger on either of these.
I love my Droid X - it was my gatway device into rooting, hacking, modding, etc. The blur and bloat was never an issue for me, as I jumped in and rooted straight away...