Yes, I would recommend following the tried-and-true method to prevent any possible bricks. Just downgrade to 9.2, back up your sysnand, get your OTP by downgrading a clean 9.2 emunand to 2.1.0 and flashing it to sysnand, then restore back to 9.2 after it's dumped.