+1 for A2P/custom. You play pretty heavy stuff through a not overly heavy amp, so I'd say you need to push the amp a lot harder than an A2Pb could do. (though i don't know how much you use the pedal board)
For me, I like 59'(b) and APH II . For you, put a 59' in the bridge and put either a PG or a Seth in the neck. Either one of those combo's will be killer for almost any style other than seriously heavy metal or thrash.