Don't sweat the swimming. If you can do it with flc, flak, pack, rifle, etc..., you can do it with a flightsuit on.
As for the wait time, it is what it is, as soon as you think it is going to go fast it will slow down. Nothing you can do about it, so don't even bother thinking about it...