I've decided to give a couple of these a shot. One in the truck and one in the 325is.
I ordered these:
https://www.amazon.com/dp/B08LG8J8NJ...t_details&th=1
Conveniently, it comes with every connector type you might want. (Note that they sell them with and without tender circuitry.)