Monster 821 APS replacement

Hey everyone.. My 2015 821 Stripe has been having problems with aps.. When riding even at 4-5k rpm, the bike runs jerky and I feel like the bike runs differently every day.. One day it's smooth, the next is rough..

​

I had my mechanic reset my aps, and that solved the problem for like 3 weeks, and then back to same old.. So now I'm thinking about getting my aps replaced at the dealership which quoted me ~$400 including parts & labor.. I'm wondering if there's a better aftermarket piece than the oem.. I googled a bit, but couldn't find anything.. Anyone has any thoughts, experiences with this? tx!

​

UPDATE: Took the bike to the Ducati dealership. Apparently it's not an APS issue but a ground shorting error.. They updated the software, did some resets, and the bike is a MONSTER now.. lol