Match submarine decay times to rowboat times, reducing them a little. With the 45 minute grace period, and the infinite life when indoors in shallow water, there's no reason they shouldn't match.