TTR 600 Performance

[bolla]

I have a 98 TTR 600 in supermoto trim.It looks nice,sounds nice but I
am thinking it should be a bit quicker.It has a CRD pipe I think the
jetting is standard but it also has a different cam fitted I recently
had it dynoed as it was not running right (dirt in carb)after cleaning
carb it was running fine and making 36 BHP.I am sure it should be more
then this.
The bike pulls fine but seems to run out of power quickly,I have 15-44
sprockets.
Is the bike restriced by the CDI?
If so would I damage the bike by fitting an aftermarket CDI (from E
bay)or would it improve performance?
Could the modified cam be doing more harm then good?
I was told it would be better to have a standerd cam and get the head
worked on.
Is the standerd cam in the TTR the same as the xt 600 cam.
Has anyone put an XT 600 engine into a TTR if so was there any
problems with the front sprocket lining up with the rear ? also what
about the ignition system.
Hope some one can help as I would like a bit more power but still want
a reliable bike.
Thanks John