Looks like the WiFi mesh was the right solution for the horrendous WiFi coverage in the new flat.

3 little mesh routers later, and I have excellent speeds everywhere on both floors, and, more importantly in the office where I edit / publish stuff.