My suggestion is for you to call Apple
Going to the store is a real zoo (at least mine is). I have no idea how people can have an intelligent conversation in there. So noisy!
Explain quietly what happened and that you are displeased with the Apple experience
I know someone, 6 months after applecare expired, go a brand-new macbook pro. Your mileage may vary but worth a shot.