Addressing the dyno charts on Toomey's website. You see they cut off the curve at 8500rpm. Had they gone any farther (say 10,000rpm), you would have seen the lines cross in favor of the CPIs. Also, I'm sure the motor had stock EVERYTHING else except for jetting. The CPIs are just too much what they had. Depending on your portwork, you might just see that the CPIs pull harder all around than the T5s. I really don't think the CPIs come on much later than T5s, but CPIs will give you plenty of overrev where T5s just fail after 9-9.5K. Do a search on Tom Borrink's R2 pipes (second gen Rockets). I have no personal experience with them-yet-but the few that have indulged in a set speak quite highly of them. From what I understand is that it has similar top end and overrev of the CPI inframes while edging the CPIs in the mid-range.
Going with a 4mm crank will also give plenty of ridable torque from the grunt all the way to the top, but you should be wary that stock stroke ported jugs sometimes cannot be reshaped to maximize the 4mm crank. Its best to send your jugs out to a reputable builder and get a professional opinion first. So, what type of port work has been performed as of now? With decent porting you should be able to run away from any bolt on 4 stroke in a straight line. With a 4mm, you'll be able to run away and hide. And with a cub, you'll be able to run away, hide, watch them pass then do it again all before the finish line. lol