Don't rule out the battery!
I had the exact same thing, with nistune, bigger injectors... I would get stuck in all sorts of places, then I changed the battery and got a trickle charger that sits on it every night, and the problem hasn't happened at all since then
Are the cables you used to relocate the battery big enough?