The agent just called me back and said that after further consideration, the hotel was happy to offer me a room at the FHR rate with all amenities.
The "further consideration" being that the Amex manager called the hotel manager and got it sorted out.
So, all is well that ends well. I'm not holding my breath for the upgrade, but that's fine. I'll take the free breakfast & lunch.