Bitten the bullet and waiting on Catalina to finish installing! In other news pulled half a ton of lint out of my iPhone X charging port.