Supply from China, suggestions please?

Eric,

I think you could add listed things below to your stock.

Chips:
ATMega 328
ATMega 644

Buttons such as high quality once in metal, off/on or off - (ON)

Maybe some packages with mixed resistors, capacitors, connectors and so on.