Sorry I didn't jump in sooner to help with the disk. I would have to pass the ball back anyway because I've only resized disks a few times before, and I wouldn't be comfortable doing it to a "production" system without a few trial runs anyway.
Glad to see you seem to have figured it out though! 🎉
It does look like we're in desperate need of a world trim, though, if we're filling the disk like this. Since that's being discussed in the 1.12 thread I'll just boop myself over thattaway…