Just to tidy up here. The same problems returned over time, I ditched all the ISP provided router/swtches, and got an Edgerouter4, tp-link Poe switch and a tp-link Poe AP on the ceiling.

So far everything works as it should. Silly not to have done this years ago.

cheers CD