Hey, it's true that a good lens pretty much can top the list, whatever you can afford ...!
As to the battery situation, well I'd say yes, get ehat you need to do your stuff! I made a habit of carrying spare batteries, well-charged. That has gone both for flashes and also my camera(s)! Believe me, I've had a few occasions when I had forgotten to pack spares, and really needed them! Flashes can be a real headache when it comes to wearing out those batteries!
As to having and using a charger when you are at a job, well, that would certainly be a challenge, although having a vehicle on hand that you can plug the battery charger(s)into the lighter socket, yeah, that would be a plus!
And then, I had to make sure that I always had my multiple chargers up and running scattered around my home "office". Have those spares on hand, there is a good reson why we pack bags with plenty of pockets!