I sent you to the wrong thread--this is the one for the Food Substitutions and it has better choices than this thread does:
You have done a lot of good work!
Yes, you do have to use dairy, I have found, because otherwise you can't really get enough protein in. 2% cottage cheese is really good, as is lowfat yogurt or Greek (0% fat) yogurt. I also like lowfat string cheese.
Good luck! Looks good.