You're doing everything right!

The more consistently you can monitor the chlorine and bring it back to shock levels, the quicker it will go. The same goes for brushing the pool, the more frequently and thoroughly you brush, the quicker the water will be completely clean.

I'm glad you found a way to bypass the filter so you can vacuum to 'waste' - this really helps get the water back to clear and sparkly (not to mention all the cart cleaning you don't have to do )

Please continue to keep us informed as to your progress , and of course ask any questions you have