The Orbi is a great solution for this. It creates a mesh of signals that blanket the area. I highly recommend the Orbi RBR40 with 3 Satellites included, I have the one that operates in both 2 and 5 GHz range. It can be a little expensive but the peace of mind is totally worth it.