That's why I don't like modeling in "rigged" space.
When I have to do it, if I can't wave link the mating data into my file, I usually go with your option 2. That way I can move the datum planes, as needed. If something changes, that requires an angle change that wasn't accounted for, you can...