Thank you for clarifying. Flying AA for the transpacific portion unfortunately.
I suppose I will chalk this one up to experience and stop trying to do anything about it.
As regards the $1,000+ YQ/YR change, this is the type of egregious fee I am more used to seeing from BA but it looks like QF is equally guilty...