Using twrp (I use the themed oneplus twrp from OnePlus 6 themes and apps section) v3.5.2-9 what I do is backup my user data partition.
Then when I want to restore a setup I flash OOS 10.3.9, flash whatever custom rom I'm restoring, flash twrp installer 3.5.2-9 zip, flash finalize zip, reboot...