The only way Choice A happens is if Disney decides to make a spectacle out of trump not being included, which they obviously wouldn't do. Nobody in the wider world is really paying attention to the inclusion of this AA, or is even aware of the rules around HoP, then the hardcore Disney fans (like people on this forum).
Your also talking about a park that's suppose to be partly a look towards the future, but who has multiple attractions with technology and references from the 90's. They could honestly just say if people asked "we haven't gotten around to updating it yet", and there would be no reason to not believe them since half the park hasn't been updated in decades.
Also, you are all missing the idea of active vs. passive protests. Its much easier to protest an actual physical AA (and then the ramifications of video from that) then it would be to protest the lack of something that could easily be argued away. And as I said, in todays world outrage over the lack of the AA would be maybe a couple days in todays news cycle, but having it there for years creates the potential for multiple outrage cycles (from people just heckling it, to fighting over it, to vandalizing it, etc.)