Just realized they do have 1 direct flight on the way back for 20K BA, but nothing for any flights on the way there. Options seem to be keep my itinerary if I want Business/First, or I can fly 1 day earlier with a direct coach flight and just pay the $25 baggage fee.
So either 2 direct flights, 1 coach and 1 business, for 27.5K AA + 20K BA, or keep my current itinerary and spend 30K more.