any ideas other than Yambits of where to get Carb rebuild spares (Diaphragms notably)
Oooh, that question will lead you right down the rabbit hole. This is one of my favorite research projects!
For for Mikuni BS34 diaphragms there are only a few suppliers that I am aware of. I have not tried any of these personally, but if I were in need, these are the places I would investigate for availability, price and delivery time. Unfortunately, most of these sources, save one, are North America based, but perhaps someone in the UK is carrying this stuff as well.
http://jbmindustries.com/diaphragms.html
Also worth chasing down might be a distributor that handles K&L Supply Co. stuff. There looks to be some BS34 parts in the K&L catalog as they have a slide valve diaphragm part listed as 18-2805 3CF-14940-00-00 for the XS650 Std/Heritage Special/Special II 80-83 which uses the same BS34 carb as on the XS400, so it will probably work:
https://www.klsupply.com/
I think Cruzinimage has the K&L part available for retail sale (also a bunch of other hard to find carb stuff):
https://www.cruzinimage.net/2018/07/23/80-83-yamaha-xs650-carburetor-slide-piston-rubber-diaphragm/
This is a Japanese retail shop that definitely is worth a look. They might be the supplier for K&L.
Another big supplier used to be Sudco International, but I think they have discontinued operations:
https://www.sudco.com/
As far as general carb soft goods for rebuilds, there is still a lot available directly from Yamaha, but I have good experience using kits from Keyster. These are made in Japan and I think are pretty good. I bought a basic kit from MikesXS.com here in the US. However, for something as important as butterfly shaft seals, I have only used the Yamaha OEM part as I think the quality is worth every penny of the cost (256-14997-00-00 or 2A2-14997-00-00).