Did I make the right choice??

So, I am a Taylormade guy thru and thru....for whatever reasons.  I like the way the clubs feel, perform, and mostly the way I play. I currently play an r5 driver which was given to me, but have decided to upgrade. The clubs I am looking at now are

r11 (not the s)

Burner Superfast 2.0

and Rocketballz

Obviously you can see my pricepoint.  I was debating between getting fitted at golfsmith or golf galaxy, but at the last minute decided to get fit at a country club which Taylormade Lists on their website as a "Taylormade Fitting Center."  They use the Launch Monitor and Ball flight technology to do the fitting.

I have to assume that this is as good, and probabaly better than whatever I would have had done at Golfsmith or Golf Galaxy.

You're either using the wrong tense in the topic title ("did") or having narrowed your search down to a flash in the pan is your mistake?

Golf Galaxy and Golfsmith are capable of doing perfectly good fittings and beyond that country clubs are capable of doing crappy ones.  Not that you made the wrong choice though because you didn't.  Getting fit is always a good choice.  The only thing I would do different if I was you is to hit more than just those three.  When I got my new clubs back in July I had my mind made up on a TaylorMade R11 with Titleist AP2 irons... I hit everything I could and I ended up with the opposite; the Titleist D2 driver and Taylormade irons.  Just hit everything you can... you may be surprised by what fits you best.

I can't answer the question 'Did I make the right choice?'  I say this as you need to go to the fitting, and collect data/test results and then decide on the correct driver to replace your current R5.  If you're concerned about the decision to go to a TaylorMade fitting center - which is officially sponsored by TaylorMade - over going to a big box store to buy your driver... I don't think you made a poor decision.  You should have the opportunity to hit the same/similar clubs.

Just remember... The R11 and Burner Superfast 2.0 are clubs from previous years.  They may not have these clubs available for resale/fittings.  You may only have access to hitting this years product (R11s and RBZ Drivers).