Cloak of Shadows

Before someone immediately ceases this opportunity to point out I'm lv39 and hunter, I'd just want to say I have a warlock lv70 and rogue lv70 as well and it's up to you to believe this or not.

I won't say this isn't a whine thread about CloS, because it is. Cloak of Shadows is the worst designed spell in-game and Blizzard has really screwed up the pvp when doing this. Reason I'm posting this on warlock forum is because I can only speak for warlocks when saying this totally slaughter us.
No, it can't be countered. Why? Because all warlock escape spells are dependent on your enemy not being immune to your spells (unlike other protective spells like for example Blink or even heals).
Also, 5 seconds is eternity in pvp and enough for a good rogue to completely pwn a cloth class. On top of this a warlock is most likely incapacitated or stunned outside CloS duration.

Now I'm not saying "remove everything that isn't good for me", because I play rogue myself so CloS means fun time for me. But I'd like to be able to beat rogues on my warlock as well without having to have an expensive engineering item and drinking potions.
The solutions I could come up with are:
1. Make it only remove harmful effects and remove the immunity duration.
2. Heavily increase cooldown to 5 minutes and include it in Preparation.
3. Don't have it remove harmful effects, immunity effect only.

So go on now, call me a moron for thinking just like the majority of the non-rogues (and to some extent rogues as well).
And please don't post comparisons to Felguard and/or other talents and spells in-game because my point isn't to play sandbox games throwing mud at each other, my point is adjusting a too powerful ability to make pvp more fair and fun for all classes. If you have any other suggestions on totally different topics about changing spells, please write your own thread.