The guy I bought the bike from had mentioned this stall at 7k. I figured I could work it out. We'll see. He was nice enough to include an extra CDI that he had purchased in the process of deducing the problem. He didn't try the CDI. After I change the plug (which looks pretty dirty) I will give the CDI a go and see if that helps.
Thanks,
Ben