Yeah,when things get too outa whack it's best to start over. Don't rely on someone else's data and tune for what your engine wants. Watch your duty cycle in the datalog. If DC is really high it's telling you that you need to turn the FP up. Like you said,one thing at a time.