Go with the dedicated drive idea for longterm storage. iTunes could leave you :( when switching between computers.
For sorting and playback during performance I use iTunes - the groups and sub groups work great since you can organize by act and augment the track name with info about when the...