I came here to say the same thing, kept pressing the wrong button when I did it fast. Yes please swap them so the next button is to the right. Consider adding

I came here to say the same thing, kept pressing the wrong button when I did it fast. Yes please swap them so the next button is to the right. Consider adding a little arrow icon or '>' on the next button just to help remind us. The music button could also have a little music note icon.