I think the navigator trumps the saboteur, or at least it did the last time i was in that position (meaning once diverted you could just re-target the base with the navigator).
Wait...FateCreatr said that the navigator trumps the saboteur, but Noel said FateCreatr was right...but that the Navigator CAN'T change the course of the sub...so I still don't know the answer.