If you get impatient with waiting, you might want to check out the sand in the filter. Do you have a way to remove the top without cutting open all of the pipes (unions are used to connect the PVC piping together)?
I'd like to say here: I am no expert, just someone with a pool and some knowledge. Feel free to correct me if I say something weird!
Sounds to me like you need to use some pool shock. You said your pool smelled strong and had CC, so I would recommend adding some Cal Hypo to eliminate the combined chlorine. If you are near a leslies they sell Power Powder Plus. About 2 of those bags should be good for a 30 gallon pool, but you're FC is already at 10 so maybe you won't need to add that much in.
Other than that, keep vacuuming all the garbage out and you should be okay.
I did use some bags of shock when it was green..but after it turned to cloudy I've only been using the liquid chlorine. I didn't want to increase the calcium because I had high calcium 2 years ago. And it caused a buildup of grit all over the pool walls. It's still gritty to this day