I know you' said 'budget' but have you tried the new Fender Ultra Jazz 5?
I'm not normally a fan of Fender basses but that one gave me something to think about. If you're already a Fender fan I could easily imagine how it could become your "the one" bass, which means you could sell everything else you have, which is how you would liberate some cash too.