I'd wait on the CYA until it's all cleaned up. You'll know the clean up is complete when you lose less than 1 ppm FC overnight ( no FC loss to sunlight ) and there's 0.5 ppm or less CC.
I'd also bring the Calcium Hardness up to protect your pool surface.