Here is my 2 cents on the matter of a tweak
what about just splitting the cloak ability from the the armor so he has cloak to get close/flank then armor to mitigate the damage he takes from bullets and aoe damage while escaping but it deos not act like it currently deos now armor would just act as an extension. Also the split armor would act exactly like the cloak if you do an action such as shooting or stabbing the amor turns off same as for cloak but when this happens the armor timer resets and is on maximum cool down and you can manually turn off armor to spend less time in cool down and the cloak stays as it is.
