Time to revamp my bag with a fitting.

[eyok]

Before I went to college, I play a TON of golf - got down towards scratch, was a division 2 hopeful (but never made it). After taking essentially 6 years off, I've picked up the game again consistently for almost a year now getting my score down back towards level par, a tad off, but I'll get there with some more short game work. 

With my clubs ageing towards 8 years old now (and some spare money to spend on toys), I have been looking to revamp my entire bag by taking a trip down to club champion to get my whole bag fitted. The discussion I have for you all is 1. have you guys had any experiences with Club Champion? Any better alternatives? I heard they were great, but I've also heard that they generally put people in equipment that way too much (my budget is about $3,000 +/- some depending on how many clubs I end up replacing - looking at you putter). 2. When would be the best time to do the fitting in respect to the new equipment. I know the PGA show is at the end of January, but will retailers have the clubs in their hands by then?