After a full charge, it's running out of puff after
intermittent use over a couple of hours.

A couple of hours sounds quite good using flat spade bits. Remember, you
have a small 12V drill, it can't work all day without charging! One reason
that many drills are supplied with two batteries is that you use one whilst
charging the other and swap when the first one runs down.

Christian.