Cyanogenmod 7 (Gingerbread) should be out in the near future.
What's bugging you about swype? I haven't experienced any bugs recently and there's gingerbread skins out there if you don't like the stock one.
The whole experience has been a pleasure to type with.
If its not going to cost you too much, I think the upgrade would be worth it in your case.
oops double post