Good morning gentlemen/gentlewomen.
I'd like to put forward the switching of Atranta and Wayfarer's Rest. Both of these builds lack canon location (as in, neither castles are on any official maps), but canon seems imho to support what I'm proposing. Here's why:
1/ Lord Vance of Wayfarer's Rest was, along with Lord Piper, put in charge by Edmure Tully in book 1 of defending the pass of the Golden Tooth (A Game of Thrones, Chapter 40, Catelyn VII). This strongly indicates that the lands of Wayfarer's Rest should at least be in the vincinity of the border with the Westerlands, as it would make no real strategic sense to put the lord in charge if his lands are closer to the Crownlands' borders. Lord Vance is at the pass when Clegane starts doing his usual shit.
2/ The Vance of Wayfarer's Rest are the overlords of the Smallwood of Acorn Hall (A Storm of Swords, Chapter 22, Arya IV). Putting Wayfarer's Rest where Atranta currently is would make it closer to their vassal, and make it more realistic for the Smallwood to seek the protection of the Vance.
3/ Lord Karyl Vance of Wayfarer's Rest is the one in charge of defending the fords north of Riverrun (A Clash of Kings, Chapter 45, Catelyn VI). With him returning to his castle earlier in the book to defend it (A Clash of Kings, Chapter 7, Catelyn I), again the current position of Atranta fits better.
4/ After the battle of Oxcross (in the Westerlands), the noble captives are sent to Wayfarer's to be kept there (A Storm of Swords, Appendix). Yet again, it makes for sense if Wayfarer's is where Atranta currently is, close to the Westerlands' borders.
5/ There is no official location for Atranta, thus meaning there is no argument in favor of it being situated near the border of the Westerlands.
As such, I suggest we simply swap the warps and positions.