Funny, I'm the same way. I've been waiting for WP7, but for some reason the Kin cancellation now has me either getting an EVO or Epic. Although I knew the Kin was a flop, something about the cancellation just flipped a bit in me that said, "skip the first gen WP7 devices".
If they turn out to be good, I'll get one in 18 months or so. But the Android trajectory is looking pretty great.