Surf contest rides back into Huntington Beach