Sorry to hear that you are dealing with this delima...
The following response is just my personal opinions...
In my opinion, the G1 would be better fitted to your liking. This is not just because I currently own a G1 and absolutely love it. I am in SC and currently there is no 3G and the G1 is limited on an Edge network in my opinon.
As far as the QWERTY keyboard is concerned, I recommend you grab the G1 because it does have a keyboard. I try to use the built-in OS Keyboard in Steel(Web Browser) and it is too constricting. Remember that using an on-screen keyboard is convenient, but not very practical when your fingers keep rolling over on other characters...
I find myself spending more time "attempting" to use the OS Keyboard instead of quickly opening my G1 and typing out on the QWERTY keyboard.
As far as features are concerned they are practically one in the same. The G1 has a 3.2MP Cam(Video is a work in progress), GPS(Awesome), WiFi, Bluetooth 2.0 with EDR(Quite sure of this) and enough Ram to multitask.
On an average day after the newest RC33 update I find myself Listening to Music, sending txt messages(about 350 a day), browsing the web and playing a few games. With the previous being said I am getting around 8hrs+ of battery life before getting low enough to charge immediately. I am not using wifi too much and mostly relying on Edge...
I also have purchased a spare stock battery just incase I need it.
Any more questions, just ask. I'm on the forums on my phone every day....