Apple Music/iTunes Messed Up Track Order...

I recently purchased an Apple Music subscription and turned on Sync Library. However, when I did that, a lot of things were messed up on my iPhone, mostly the album art. No problem, got that fixed pretty quickly. However, after some time, the order that tracks are displayed on my Mac got screwed up completely. Nearly all of the albums I have are ripped from CDs, with only one or two from Apple Music, so theoretically, nothing should happen on my Mac, right? Some of the tracks are displayed as out of order (ex: 1,2,3,4...20,8,10,12 or 1,2,3...6,7,9,8... or 3,9,12,1,2,4...) yet when I click on the "Play" button, it plays correctly! And it's not like I can change this - some of the metadata for some songs is locked, and even the ones I can change don't work (as in, re-entering the number doesn't do anything) and re-importing by dragging the file onto my desktop, deleting it from Apple Music and putting it back in doesn't work either. Does anyone have a workaround as to get this fixed? I really don't want to re-export them again, especially considering I did them all as AIFF files, so they'll take a long time.

Any help would be greatly appreciated. Thanks!

(EDIT: This is ONLY on my Mac. It displays fine on my iPhone... really have no idea what's going on!)