Hoping I don't jinx anything. So far there has been no issues, since I redid the Tri-Cree soldering and used heatshrink tubing pushed up on each wire to the solderjoint, I've not had any issues. Multiple uses and battery swaps.
Also the new 2watt resistors were a good change too, they get hot, but not stupid hot that they are melting nearby wires and plastic like the three 3watt resistors did.
I think the next build I will go the route of a charge port and kill key
Thanks again to everyone who helped out.