As a G08 owner I normally would say go for it. But if there is any way you could demo either or both in YOUR HOME that should help you make the decision. Personally I think your largest investment should be the speakers you really like. You have a great system and you really need to demo ANY possible upgrade in your home. I've learned a world from that.
Good luck with whatever you decide.
Good luck with whatever you decide.