Hi Keith,
I've only just joined, so I'm sorry if this is too late for you, but I'm thinking of buying and wanted to understand the upload as all my music is pretty much ripped and sorted already and saw this post.
If you have access to a PC, then mp3Tag (
https://www.mp3tag.de/en/) is a useful free tool. For your issue, as long as the track number tags are complete, then you can use the program to bulk rename the files on the basis of the tag -
use
Tag to Filename with the option of
%track% - %title% in the options - it will preview the end result beforehand.
You don't have to do each album at a time either, you can use the 'up folder' (folder with blue arrow) to go to the root of your music collection and it will show all the tracks it finds in the subfolders.
Hope this is of some help.
Phil