Small update; took the points Ballistic9 gave and added the two training items. Also cleaned up some of the 'removed' training items and fixed up the HV Stats since there is no "Rating" anymore.
My apologies for potentially bringing this topic back to life.
I've found a small bug (at least on my end): In the Training Tool when I save the current level of Scavenger, that same value is also saved for the current level of Set Collector. The program seem to print out an error message if the value is 5 or higher (thus how I noticed it).
May be something to look into along whatever updates you plan for the near/distant future.