Frankly, I have to acknowledge that gameplay-wise, VonHelshing's fix
is a bit more interesting, in the sense that it actually makes battery power a consideration. It might, of course, be a different ball game now with the escorts chasing you longer, but so far as I can see - battery power is
really not a factor under the default model. It is a factor under your model, on the other hand. I'll reserve judgement on how realistic it is, but I think Observer's points were very good on this.
Anyway, a matter of choice