Thanks again for both replies. I think my inclination is to at least investigate the possibility of upgraded groupset(s) but with covid, I may be a while finding a place that even has frames or bikes available. So, it may be a while before I re-surface with more questions.
Stay healthy