I'd prefer to go with WP7
I would much rather move to WP7. My renewal period is in April, if there's a WP7 announcement by then, I'll base my decision on that. If not, I'll either go to AT&T (their coverage map has recently improved in my area, and I just won a free Samsung Focus) or the Verizon iPhone (provided there are no surprises with it, dropped call issues, etc.). Verizon iPhone is basically my fallback plan in case I can't get WP7 by April or within a few months of April. No matter what, I will NOT be using an Android device ever again after June or so.
J.Ja