Thanks, both. It's a DONE4. I booked it on the website for the first time ever (doh!) and for some reason it was ticketed by Qantas despite first 2 segments on BA (there are more segments on Qantas and one very small one on AA). I will see if I can get a good BA person to help me.
I should have said that I solved the problem I mentioned (by just saying no I won't pay) but now I want to upgrade the entire itinerary from D to A.