Sadly, I think your estimate is going to be about right.
After several tries, I finally reached the dealer who confessed his "Leaf specialist" mechanic left and no one else is trained as a Leaf specialist, so Nissan won't allow my car to leave the Port in LA until they either have a new Leaf...