A small outline of the equipped diving goggles should be visible in 1st person when diving. This should go a long way to make diving feel more claustrophobic and immersive. Maybe even the glass of the goggles should be visible (barley of course).

Like night vision, I think it is important that the player "feel" that he is wearing his diving goggles to make him more conected to his gear and the simulation in general