Hi Ed,
Check the flea market section, there are a couple of machines listed that maky still be available, some even within a reasonable drive of your location.
When you get one, show us a picture. Good luck!
Luckily for me, I don't currently need any warranty work; at this point the best I am hoping for is that repair/replacement parts will be available as I use and break/wear out my machine.
I'm sure you will be able to count on me as a future customer.
But you have done an excellent job of capturing every most likely charging scenario. I'm excited to see this much interest in developing alternative charging solutions.