Yes, I agree. Intrinsic or intra-consistency first, extrinsic or inter-consistency second. Honestly I think the word consistency has been overloaded beyond recognition and it can be hard to convey exactly the subtle meaning you want by using without plenty of qualifiers. Hence coherent : )