Make it so you can manually end the scout's cloak by pressing weapon switch(triangle)
You would obviously have to wait for a cooldown to use it again. This allows you to go on a flank and once you are in position get your gun without having to go for a melee or wait for the cloak to timeout
Pressing the same button cancels the cloak.
When cloaked, just press the same key as you activated the cloak with, again, then you end it manually...