I am no expert, but just went through all this with an electrical gremlin. Assuming your jetting is close enough to rule that out, Here is the order I addressed it:
-test coil
-test stator
-test pickup coil
-check and clean ALL electrical connections (I ended up just making an almost entirely new harness with new connectors), and put NOalox or similar on connectors.
My next step was to try swapping out the CDI unit, and while waiting on it to arrive, I pulled the stator cover for an inspection......well I noticed that the stator was a little loose,and rocked back a forth a few degrees! I then pulled the flywheel and simply tightened the 3 phillips screws that hold the stator together. Boom, top end break up and popping and power loss solved! I also cleaned everything up in the stator cover while I was in there.
On your cdi question......after all the reading I did, it seems that most say you can use either part number and that only the timing curves are a little bit different. Then, some say that the wiring and or connectors may be different between the two model year groups. So, take that for what its worth, but I think you can use either, honestly. Hopefully someone will be along to answer that part for sure.