When the problematic bike shop said they would make it right, what do they mean? Would they get you a new frame and switch over your components for free? If so, that would be making it right.
If short of that, what do they propose?
I am afraid that the fitter is not going to make your bike fit. If I recall, it is way too big for you. However, the good thing about working with the fitter is that you can find out exactly what you need.
Trek Madone 4.7 WSD
Cannondale Quick4
1969 Schwinn Collegiate, original owner
Terry Classic
Richard Feynman: “The first principle is that you must not fool yourself and you are the easiest person to fool.”