Long story short, had to send the phone in for repair, so I did the obligatory backups and unroot/reflash of factory images.
I don't have TWRP, too much hassle together with magisk for taking OTAs, so I took my backups (/data, /data/media) with tar/split/gzip.
Did my due dilligence to make...