Update on the club situation:
Driver & Fairway woods: I ended up getting the
Cobra King F9S 10.5deg driver (F9S is the Golf Town edition lacking a CNC milled face but I'm not making money off my golf game so eh) and a matching 5 wood, skipping a 3 or 4 wood.
Irons: Found a set of TaylorMade M CGB -- the new version of my clubs -- at Golf Town for $620 (

) just missing a 7 Iron, but as two of my irons had mismatched grips -- the 3 and the PW -- they wouldn't accept them on trade (which is a stupid rule). So the R7 CGB Max set is getting new Golf Pride CP2 Pro midsize grips, those will be ready on Monday.
Putter: En route, a used but good condition
TaylorMade TP Red Collection Ardmore 3 and an
Evnroll MidLock XL grip.
Extras: Even though I have a sand wedge with my current set, I decided to round out the set with a
Hummingbird H7 since I seem to always find the side of the bunker closest to the hole.
That still leaves me one spot open in the bag for another club if I decide that I'm missing something in my set.