Better. Have two lines.
Line 1:
Pick your song in booths, and get an "interplanetary passport" which has your song code on it. The TM at the front of the line scans your card into the seat, and that song plays.
Line 2:
Regular queue line. Your song is random.
I actually like that. So people who could care less (or re-rides) don't have to wait longer for people to choose.