To help illustrate what I'm talking about, please see the attached schematic.
For the new wifi router, I'm also considering the Asus RT-AC68U, TP-Link Archer C7 or Asus RT-AC66U
Let me know your thoughts on which router you would recommend or even which powerline adapter to get or if the way...