Have you considered an East P-Retro? You could leave the p/up selector switch as it is and feed the output into the P-Retro which will give you passive with vol/tone, and then the very flexible P-Retro active options.
I've seen this set up on an ACG bass and it's a really good combo, masses of flexibility.