Thanks mate - at current the games I play really aren't graphic intensive, more your esports style stuff, though I will want to play AAA titles in the future. Sounds like the 6800 might be the way to go.
As far as the willingness to wait, with no prospect of prices easing, and my current CPU...