Sorry for your poor Leaf experience. Good luck with VW. I, too, am looking forward to VW's EV offerings, tempered by a vivid memory of their questionable past reliability.
VW is legendary for dismissing serious flaws until provoked with massive lawsuits: (earlier) TDI camshaft premature wear, caused by poor lubrication mgmt, HighPressureFuelPump failures (2012>>>) which destroy the ENTIRE fuel system circuit ($5-6k repair), DieselEmissionsFluid system failures, now water pump failures...to name a few.
My experience wasn't horrible, partly, I believe, because I always get "up close and personal" with any dealership Service DIRECTOR at the time of purchase, and maintain a good relationship with them...oil changes, [discounted] tire purchases, all maintenance. Countless other VW owners have been left with massive repair bills on relatively new cars, just outside of warranty.
I'm a longtime VW/Audi devotee, who chose to finally bail from VW, because of the "clean diesel" disaster. They built an amazing engine, excellent MPG, solid core reliability, surrounded by a poorly executed electronic/fuel/emissions systems that are prone to failure.
(Ironically, my 2015 LeafS has been flawless in the 3 1/2 years of ownership [tires, cabin filter, wiper blades], from 6500 miles to almost 34k miles (we bought it used). I've not visited the Nissan dealership to even KNOW any of the service techs, or the service director.)
Every manufacturer has its issues. All cars have myriad sensors, which are prone to glitches. I often joke, "My car's sensors have sensors!"
Again, sorry for your experience, but be careful for what you wish. VW might not be your best choice!