Tom,
It seems you have a restriction somewhere. You can try bypassing your fuel filter by using a 4mm Festo for 1 test and see if you reach max RPM. You also want to look at your battery voltage and make sure it's fully peaked.

Let me know how this works out and we'll take it from there.

Carlos
RTI