Yeah, I think your logic is fine on your CYA test. It's subject to a lot of inaccuracy from the dilutions but I think you're close.

If you have a water softener, you could limp by the rest of the Summer then drain and refill through the softener solving both CYA an Ca issues. (keep your chlorine up)