These were my steps to get from a 15.1 encryption (which TWRP couldn’t handle) done by 15.1 in the testing phase to a 14.1 encryption, which I then installed 15.1 on (so that TWRP as well as 15.1 could handle it).
If you want to do the same with the old camera, just don’t disassemble/reassemble the camera .