and in a conflict situation with Iran, transiting the
strait would be asking for trouble, when it isn't necessary.

That depends on the ROEs ... g

The only ROE which could provide secure passage through the straits for a
carrier in a war with Iran would be one where the Iranian side of the
straits was first bombarded with nukes to maybe a hundred miles inland.
I doubt we'll see that anytime soon.