• If you have the cash I'd advise turning off WiFi in your router, add a switch in the office (~£30) and a pair of dedicated access points (eg Ubiquiti UAP-AC-LITE ~£75 each).

    Switch in the office has three ports in use (to the router, to the AP and to your PC in there). Your router probably has a switch to connect the front AP.