Until he publishes the last book I don’t believe he wrote the queen going mad into the story.
The only thing I can't believe is that the prophecies were pointing toward Arya as Azor Ahai, or the (apparently now) more likely theory that the "darkness" mentioned in the prophecy didn't have anything to do with the army of the undead (http://time.com/5589654/game-of-thrones-jon-snow-azor-ahai-p...)