rationality is simply making the best decision to achieve one's goals, whatever they may be

That would be the instrumental rationality.

what is the discipline that helps us check the goals we're optimizing for are the right ones?

That would be the epistemic one. According to the OP, both were discussed:

I used the definitions given in 'What Do We Mean By "Rationality"?' to describe epistemic and instrumental rationality