Usopp, was in the wrong. Luffy unirionally was actually not just acting like a captain and knowing when the Going Merry was at its limit and wouldn't be able to sail much farther, but he was also thinking about not just himself and his goals, but the goals and dreams of the rest of the crew. Usopp was the one being selfish during Water 7.