Oops meant to say want to use same sockets throughout and this means on
non tiled surfaces so them the box depth may become an issue?

Yes. If they are already flush, you may need to remove the boxes and dig
some more. If you are really lucky, you already have 35mm boxes and can just
replace them with 25mm boxes.

Christian.