This exact scenario happened to me, the masteries are a little difficult to wrap your head around at first – it’s not very intuitive..
But with that said, I now love the system.
I recently (1 week ago) returned from Vanilla and never completed the old personal story.. I probably lost 2-3 mastery selections because I did the old story before going to HoT, but honestly it does not bug me anymore.