3 wishes in light of the Roose to Tywin change {BOOK SPOILERS}

[hesitantreader]

Without the trauma of Arya's travel in the river lands the whole 3 deaths plot line does not work. I understand that you really can't cut it from the story if they are planning on going beyond SoS, but I think they should have changed it a bit. Perhaps granting her only one and having her use it to take over the castle.