Oh yeah, you are right. It seemed that Shanks had many ships outside of Elbaf for a reason. Maybe he indeed was going somewhere...
Maybe against Teach... or maybe he knows that everything was heating up, so he had to be prepared for battle if Teach or anyone else goes after him.