I know its not a perfect fix but you can use the Park Vehicle mod to disable it from being in your tab cycle.
