If I were to switch those electronics, I would definitely go Bart pickups and pre. I love Aguilar pre's, but I've changed over to Bart pre's mainly because they have an output gain adjustment and Aggies do not.
Fuzzrocious Club #194
Brubaker Brute Squad #18
Spector Club #224 (USA NS-5MM, NS-2J)