Android :: VZW Droid Should Replace Moto Droid

Jus a little background: I have a launch day Moto Droid. Still love it, but it does have some lag issues that are becoming increasingly annoying. I think the issues are caused by either the fact that I'm rooted running one of the first Froyo releases, the fact that the Swype keyboard isn't really meant for this phone, the dropping of the phone (which also cracked the screen, though that doesn't bother me) or some combination of the above. Regardless of the cause, I'm ready for a new phone.

I've been out of the loop, but since I started back in, I've noticed that Gingerbread is on the verge of being released and one of my biggest concerns is buying a new phone that's already outdated. Whatever phone I get, I want it to be able to handle Gingerbread with no problems.

I'm leaning towards the Droid 2, because I like having a qwerty keyboard plus Swype. Will the Droid 2 be OK with gingerbread? Or, should I wait until phones are released that were designed with gingerbread in mind? How lon 'til such phones will be released?