You've already done a lot of the right work. With good fuel pressure and a properly adjusted air plate, it sounds like mixture or ignition timing might still be off. Since the EHA and mixture screw were messed with, I'd suggest setting the mixture back to baseline using a duty cycle meter if you can, or at least try a slight lean adjustment from where it last started.