Shanks is a pretty powerful pirate and he was able to keep up with Whitebeard. It’s a pretty impressive feat, but he hasn’t gotten a chance to fight for real as of yet. Luffy has shown his abilities many times and I think it’s safe to say that he’s caught up to Shanks. Luffy does have his Gear 2 form after all. Luffy wins.