I'd say relabel iTunes as iSync, remove the media player from it and build one from scratch, something that's snappy as hell and more modern.