I had the same dilemma as you. In the end, I solved the problem by trading the corvette

The low B was too muddy for my liking.
I was looking at Delano's, and for the preamp, I wasn't sure (but from experience, the ACG is well worth the money). In any case, it will be expensive.
Frankly I don't really know what a pickup and preamp swap would change. I quite liked the stock slap tone though.
Personally, for aggressive stuff, I loved the tone of the Thumb BO 5 I had, much tighter and growlier in the lows (the highs were a bit weird though). The corvette was no match. but the thumb was too uncomfortable and heavy.