Sounds like some great changes!
I can't imagine eating avocado in yogurt-try just sprinkling some salt on it and eating plain, or mashed up with tuna or eggs is also good.
For the heartburn, drink a tbls. of ACV mixed in cold water, or just drink a shot of it. Works like a charm.