Why not do another clone of the now good setup and completely replace the "superdupered" version? Don't wait to see what might happen down the road.

On a Mac since 1984.
Currently: 24" M1 iMac, M2 Pro Mac mini with 27" BenQ monitor, M2 Macbook Air, MacOS 14.x; iPhones, iPods (yes, still) and iPads.