The "best way" is the one that gives you the result wanted.
If you are happy with
1-01 ~ UnPlug ~ Time Unlimited (Ortus Airgap mix)
then it is the best way for you. 
If you show us a filename which does not work as expected, we can help you find the reason. It could also be a missing DISCNUMBER. Just show us a screenshot after pressing Alt+T on such a "not working" song.