fender bass build

I have a problem with my P-Bass Build.....I used a 22 fret Fender Deluxe Neck On A standard P-Bass Body and it came out great... but, due to the extra scale length the bass will not Intonate correctly.... what can I do besides switching out the neck?? ....would a BADASS bridge help? ....they are...