I notice you said stock can tune. Does that mean an SCT provided tune? On my '15 there are no supported canned tunes, and I hear bad things about the canned tunes on the earlier SHO.
If it were me, I would consult AJPTurbo, or another known tuner, and get a custom tune built just for you. Just my .02
Good luck though, it sucks when you have to run a recovery file. It also sucks that if the same thing happens again after recovery, they will need to make yet another recovery file I believe.