Why dont you get yourself another 7490 or later model fritzbox and set it to mesh mode to help improve your wifi coverage. When you do your renos you can run your cat6 wire to have the backhaul via a wired connection