If you do go back to needing a cordless impact (Which I cannot recommend enough, so handy). I would place my vote on the Milwaukee lineup. Its a little spendier to get into them but once you have some batteries you can just buy the tools you need. I have cordless angle grinders, drills, impacts, tire inflator, weed whacker etc from Milwaukee and have been nothing less than impressed.
I have an M12(12 volt line) impact and an M18 (18 volt) impact. Both in 3/8"s and they are pretty comparable. I prefer my M12 since it is smaller, but that doesn't mean it has no problem taking truck tires or other stubborn bolts out with ease.
I've used all these tools 5+ years wrenching on cars and in metal fabrication and have had zero issues with any of them.
https://www.amazon.com/Milwaukee-Electri...f5cdb68fc1