Yep basically what needs to be done is flash combination binary (Either same binary bit or higher as current existing firmware on phone). Firmware version can be checked in recovery mode.
Once combination is flashed, enable developer options after finish booting enable USB debugging if not enabled.
Turn phone off, put to download mode and then flash stock samsung rom with same binary (make sure flash home csc as we do not want to factory reset it again). Wait for flash to finish then bam you can go through whole setup without account lock.
For safe measure i always enable developer options again, enable OEM unlock then reflash rom with (non home CSC binary which will factory reset).