Super, sounds like the chlorine demand is subsiding. Keep it up - you're doing great.
Let's wait to finish the shock before moving the pH - some by-products of the shock are easier to live with when pH is on the high side.