Body upgrade - GH1 or G2

I currently have a G1, as well as the kit lens, the 45-200, and the 20mm. I love this setup and have really enjoyed using it. However, I really want to be able to shoot video. So, I'm planning to upgrade the body very soon. I'm torn between upgrading to a GH1 or a G2 body. As I see it, the pros for each are:

GH1 Pros:

• Better sensor (lower noise at high ISO)

• More video options (1080p24, 720p60)

• More video controls (shutter priority, aperture priority, M)

• Stereo sound for video

G2 Pros:

• Touchscreen (touch to focus)

• Newer (faster?) processor/hardware

• Newer (better?) software

Based on this list, I'm leaning toward the GH1. My question is, what am I missing? Any other opinions are welcome as well.

Thanks,
Chad