I don't think there is an official "original tracklisting," but that one works pretty well. My only issue is that I think With Or Without You needs to be after Walk To The Water and Luminous Times. Also, Race Against Time works much better either right before or after Exit.