What sort of "trouble" are you having? You've made enough changes that it's hard to pinpoint any cause in particular, especially when you don't describe the symptom you're trying to correct. The first thing to do is establish exactly where TDC is by using a "positive stop" in place of a spark plug. Once you're sure the marks on the flywheel are accurate, you can use a delay flash timing light to make an accurate measurement of ignition timing, not a SWAG based on a lot of guesswork and some possibly mismatched parts.
Many years of doing precision timing measurements during dyno runs has taught me something about ignition timing- - - - -ONE degree of over-advance robs as much as power as 5 degrees retarded from the optimal advance point. Always err on the low side! I've proved that fact dozens of times.
Jerry
