I am going through the same process with my 40's ish track bicycle. Second bike I took the Waterford. They are great. Two oldies shown on the links below.
https://www.flickr.com/photos/316405...7645736415391/
https://www.flickr.com/photos/316405...7628621319035/