What about adding EOM's (Early Out Markers) for use in Internal mode. An EOM is what radio stations use, when it gets to a point in the song, the next song just starts. This way, the song won't have to play all the way till the end and have silence, one can start as the next one fades