Many thanks for your detailed response, incredibly helpful.  The plan was to move to 2016 first because I have read there are some significant performance degradation in versions after 2016...