Drained and refilled - adjusting alk and calcium

[dhale1]

Pool was drained and refilled after repair. My numbers are:

25,000 inground gunite pool (white plaster)

CL 1
CC .5
TC 1.5
ALK 20
PH 8
CAL 30
CYA 0
TDS 0

Ok, so I know I need to adjust everything so here's what I did. While refilling, once I got up past the return jets, restarted filter. Shocked with Dichlor (figure that I could add cl and cya at the same time since cya is 0). That was last night. Added some acid last night and put one Trichlor tab each skimmer to keep PH down.

Got home this evening and the cl was back to 1. But, no CC. PH was high again around 8. So I added some acid. About 1 hour later I added about 3 pounds of baking soda.

So, I know I need to add calcium and after searching the forum I realize I should have adjusted the calcium before trying to get the alk up. Question is, how soon can I add the calcium to the pool? I don't want to create a milky mess by trying to adjust both at the same time. Can I get up in the morning, and add the calcium or should I wait until tomorrow evening?

And, can I add a quart of Polyquat 60 now too?

Thanks for any help.