Here are two I have used (besides my Pedego Dealer):
Greggs.
Bike Lair
I've only had non electric systems work done by Greggs and Bike Lair--tire fixes, break pads ... Greggs charges extra to remove an hub drive wheel. I hope they will stop doing that, but in the meantime, I'm going elsewhere.