I agree with your thoughts...
A shout cooldowns should be the following: each shout should gain a cooldown of the shout used or its own cooldown whichever is shorter. Noting that a previous shout on cooldown should not be affected if its current cooldown time is longer than the just shouted ability cooldown.