[tokuzumi]

If you want a phone that is similar in size to your diamond, go with the Evo Shift 4G. It's thicker, due to the slide out keyboard, but the screen is smaller, at 3.6", compared to the Evo's 4.3". It also has a faster processor, as it's a second gen snapdragon. I think the only thing is the Shift 4G comes with a 2GB micro sd, where the Evo came with an 8GB micro sd card.

And since the Evo 3D is right around the corner, I wouldn't recommend getting the Evo, but compared to your diamond, the Evo will seem like it's on steroids compared to whatever rom you are using on your diamond.

But, since CM7 has WiMax support built in for the Evo, I've been on AOSP for a few months. I can't go back to Sense. If I were to get a phone in the next few months, I'd go with a Nexus S 4G. Native WiMax support, and vanilla Android. None of that silly bloatware that comes on the Sense/Touchwiz devices.