I've already done a dnf upgrade to F33 on my system that hasn't had a "clean" install since at least F24, but at some point I'd like to migrate to btrfs w/o LVM.

My current plan is to replace my current SSD (500GB Samsung EVO 970 m.2) to a 1GB version with the process being loosely:

1. Add the new m.2 disk (via PCIE adapter)
2. Perform a clean install to it
3. Capture all the RPMs I have installed and install them on the new install
4. Migrate /etc and /var (where appropriate)
5. Move the new SSD to the MB m.2 slot and remove the old SSD and adapter (save for another system). 

Any better options? /home is already a separate 3TB spinning disk so that won't change for now.

Thanks,
Richard