Times are changing, and so are fitting methods. That's the one real advantage smaller shops and courses can offer is the fitting. It can take upto an hour and a half for a full fitting to be done right. A lot of times, smaller shops don't carry inventory, so they'll sell you anything. Larger retail outlets "fit" people for what they have in stock. I had a guy come in to get fit with his g20 irons he had fit for him at a local GolfTown. They just happened to have his 3* flat lie irons in stock! What a lucky guy! What he actually needed was 1* upright. Unfortunately, this is a common occurence.
The goal of a good clubfit is to ensure a proper fit, yes, but also to try to gain a repeat customer. As you said, it was done right, and now you want to get your woods fit as well. Clubfitters want you to leave happy with your new clubs and want your repeat business. I don't get anything from you coming back to me in a week saying you can't hit the new clubs I fit you for. I have even told people that I wasn't recommending a new driver, because there's was best. The man was so impressed with my honesty, that he bought a New Scotty Cameron and balls and we had a customer for life. It's a complicated process, but I like to set some guidelines with my clients and explain ahead of time where we want the spin, launch angle, and all the other parameters to be based on their ball speed, so it doesn't look like I'm trying to make a club sale.
I'm glad you enjoyed your clubfitting!