Orbital Fasteners in the UK will do N-off of any fastener, for any value of N, sorted into labelled bags :-) So I just ordered 150% (approx) of the count of every one in the BOM (to have some spares). Thanks to nophead for pointing me in their direction.
Gerv