I have updated the Amazon scripts with better track and disc number tags: /t/1681/1
It should make it a little easier.