Pickup change Cutless

So I love my EBMM Cutless….However, not a fan of the noise circuit or pickups. Has any one changed pots, volume and tone+ upgraded pickups? I am looking for recommendation. Thanks