Making Battery Sockets from 19.2 Volt Work Lights

I will cut the Craftsman 19.2 Volt work lights off at the work light battery slide connector.  I tried to match the contour of the work light base that mates to each other.  Notice that the solder wire terminals are protruding above the cut.  I need to get these socket and battery assemblies as short as possible to get them in the battery compartment.  The total battery length needs to be under 16 inches.

In the last photo the protruding solder tabs are plainly visible and I will need to grind some relief holes in the mating battery holder.