You may want to first check the hotfixes that will be in 0.16.2 to see if they could apply to you: https://github.com/lightningnetwork/lnd/pull/7644