Bart for sure. I'd also keep those pickups, I have them in my Lakland. They can do just about anything.
I do like Aguilar preamps as well, but I would choose a Bart over Aggie simply because the Aggie lacks an output level control trim pot. It's not a problem if you don't care about matching output levels with other basses, or if your output is already low enough to not overdrive whatever you plug into. It's sure a nice feature to have though.
Fuzzrocious Club #194
Brubaker Brute Squad #18
Spector Club #224 (USA NS-5MM, NS-2J)