The first thing to try is a new plug. Try an O.S. #8 or #A3 plug. If the engine will run OK with the battery connected, but not when you remove the battery, then the plug is most certainly suspect, even if it's new.

Your needle settings are good starting places, so the engine should run from there, and allow you to gradually lean it.