It sounds like you're in the homestretch. Keep it at shock level until it maintains the FC level overnight and then keep the FC between the Best Guess table min and max for your CYA level.

You probably already know this but regular old 20 Mule Team Borax is a much cheaper substitute for pH Up.

Congratulations on getting your water cleared up.