It looks like the last chapter has given an answer to this thread.

It is mostly likely Garland Figarland himself who will be Shanks' major fight in the whole series.
One where he will display all his abilities and win against one who most likely is his father.