Regarding diet i am doing all the things you mention. Nothing will get between me and my veggies and green drinks! :-)
It took me a couple of years to source a true raw, unfiltered, virgin olive oil farm that still use a stone to grind the pulp of the olives and strain off the oil! They're in Greece. It's a fabulous oil.
Bread was something i had a weakness for too, but now having not had any for 6 months i feel much better. Being a 'digestive issues' person it didn't help at all!
I do pray sista!! I often look up in desperation...hahaha...and ask for a clue as to which healing path to follow! Oftentimes before sleeping i also ask and have had some amazing dreams!!
Hydration is something i'm juggling too. I crave salt. Sodium output in my urine and blood is low, yet i consume pure celtic grey unfiltered Sea Salt with every meal. I think low sodium is why i am not craving water. So balancing your electrolytes will help you automatically drink more water. Do you crave salt?
Something i love to drink is lemon water but to drink 3 litres a day is currently challenging.
One thing i thought of doing to up my water intake was to buy one of those athletes water bags which you wear like a ruck-sack and it has a straw coming out of it which lays right by your neck - so you can sip from it all the time. I was doing alot of physical work without many breaks so it seemed at the time to be a fab solution!
Important to make sure you're getting the salts in your diet if you up your water intake...to prevent the osmosis of the cells becoming challenged...and edema eventually becomes a problem.
Thanks for the pdf link - i've saved it. D3 i have supplemented...but i have high calcium and magnesium results from a hair test. So am not sure how that can be. I'm taking 10,000iu D3 - one a week now.