Still sounds like a fuel supply problem. Make sure to blow out the lines and replace pickup,filter. Clean the carb out really good. Make sure all jets are clear. Check your timing advance as well.