I've never seen a Fender I'd pay $2000 for (unless I could resell it at a huge gain with minimal effort!) so with that budget I'd scratch Fender and go with a high quality builder. You already mentioned Sadowsky and Lakland. Also check out Mike Lull. He does some outstanding stuff, as does Nash. If *I* were to buy a P, it would be similar to this one:
http://www.bassnw.com/New Exotic Basses/mike_lull_p5_ibm_brw.htm
Lull is in his price range but US Sadowskys and Lakland are way more than $2000.