I'm still going with the Thunderbolt, but if the iPhone5 isn't a whole lot better spec-wise I may see if my wife will want this for her upgrade. She seems to really like the sliding or flipping full keyboard (she had an enV2, a Reality, and now a Moto Droid 1), but she also has a ZuneHD and said she could probably deal with a glass screen touch phone.
So for me no, but for her, it really depends on what comes out between now and her upgrade in January.