That all sounds good.  You also might want to avoid, or at least limit foods with oxalate, like spinach (and other greens) and some nuts.  I forget what else is high oxalate.  You can find it with a quick web search.

I've also recently read about some specific gut bacteria that help your body process oxalates so they aren't a problem.  I don't have more information than that, but it could be worth researching.