Good to hear you have found some substitutes.
Don't know if it was mentioned already but milk powder can be added to various recipes to increase protein, calcium and vits, it's a tip I picked up from others when my toddler dropped his milk intake too low. I add it to muesli, milk, pancakes, but there are loads of dishes you can add some to for an additional boost.