I ended up using the diff tool in tunerpro to move my changes over to the factory manual bin and am happy to report that the issue is completely gone now.