The swimming thing is pretty bugged as it is almost impossible to get units who can swim to use the bridges- they will always want to swim instead- I'm afraid you will just have to account for it.