I think a mesh router system will solve your issues. You can get a very strong signal everywhere in your house.
They're really not that expensive anymore.
I think I paid $80 for the TP Link Deco system a couple of years ago.
My daughter has the Google system.