Absolutely on track!! Keep that Cl up around 20 by constantly replenishing ( three times a day, if you can) and your pool will be sparkling and your Cl will start to hold. You have a good grasp of the issues

Dave S.