E-series power complete bypass

Yes, J2.

This code is mostly what you need, but remove the lines disabling the BATFET because if you disable that, you can't power by the JST battery connector.