Just curious... were you dealing with Bafang USA Direct?
It's my understanding from other posts that they're just another reseller of a couple of different Bafang kits, with no connection to Bafang itself, which is at bafang-e.com ( not bafangusadirect.com )
Have you looked at older model year eBikes? I ride 2016 models and the resale price for them is surely getting really low. Pretty soon there has to be some real Emtb that can be bought for $500 because the owner doesn't want to put money in parts.