Start with timing. Confirm the timing is advancing properly. It sounds like you may have it retarded. Don't tune for initial advance, tune for total. You want about 34 to 36 degrees total and you want it early in the rpm range. About 2400 rpms if you can. Wherever the base timing falls,it falls.