what would u do?!!?!

i have a 36400 overclocked to 3.1 with zalmans9750, best cooler with artic silver paste!!
i have a 1000 watt psu
8.1 channel surround sound
dvd burner 18x samsung
dvd rom samsung
a full tower for the direct x 10
geil 2 gb dual channel
corsair xms 2 gb dual channel

what im lost on is what to do about the next gen... :-\ i want to make the right choice on this.I always screwed up on cards,ram,everything i always got greedy and cashed out to quick.now im doing good now i hit a brick wall
im using a 7900 cuz it ll handle anything even crysis.what im i need help on is the next gen cards. 8800 wait? till dx10 actually comes out.or just go ahead and buy and etc.or wait like i said for dx10 and get a bigger lot of cheaper g84 series that suppose to be better!!!