I have an ailing 1020 that I'm dreading replacing. Are there any new user-serviceable phones on the market? or should I just keep doing the Ship of Theseus thi

I have an ailing 1020 that I'm dreading replacing. Are there any new user-serviceable phones on the market? or should I just keep doing the Ship of Theseus thing with Amazon greymarket parts until the phone market shakes out into less of a nightmare for users?