I'm looking for integrated units like
this oneI already have a separate battery charger but unscrewing it and juggling batteries is one bit of faff I don't need. I thought I was fairly clear in my OP but apparently I wasn't - well either I wasn't or else DocStrange needs English comprehension lessons.
What I need to work out about the one in the link is:
1) Is the connector the same as the one on my BT20 (not necessarily a show stopper as I can always fit a new connector)
2) Where can I get one of these but with decent cells? ISTR that buying anything with 'fire' in the name is a bad idea.