SQ all the way. Especially given the BAEC changes - Which makes it even more galling that I booked BA over SQ/TK to nudge myself closer to what I thought would be GFL.
I may even take the hit of cancellation fees and rebook with SQ.