I gave DJI in California a call today. Had to wait on hold for 45 minutes but it was worth the call. after just a few minutes they gathered up my details and I have to send the old battery to them and they said replacement would take about 2 weeks for the part swap but they would gladly replace it. Funny, I had just ordered a couple new ones too

I guess I'll have plenty of batteries now. I'm physched that DJI stands behind this and supported me on this issue.
Thanks to all for your helpful comments!