Have the 'good' mechanic look at it to see if there's an easy fix. Just because the BB came on the bike, for instance, doesn't mean a mistake wasn't made. If it doesn't resolve to your satisfaction after the mechanic has a look you might want to go with the P2. You also might want to call performance in the meantime to let them know you have an issue and to see if they have any advice/knowledge that something might be speced wrong. If there's something wrong they're likely to pay the return shipping and all that so it might be prudent to loop them in. Good luck.