I JUST did what you are considering, except I went with the Nikon D80. It is what I have always been looking for.
I had the Canon G6, and sold it last week on ebay for $400, BIN. It was only on there for about 2 hours before someone hit BIN.
What I have always wanted in a digital is the faster response time and shutter speeds of the dslr. The D80 isn't a lot bigger than what the g6 was, but has a lot more capability.
Good luck!
ReecerX