You should get a WiFi mesh system, I had the same issue and it solved it.