In the past, I have found that you do not uncloak when you are shot.
Anyway, I think cloaking is ok as is, I think scanner modules might be a good addition though, They could have logarithmic scaling so that 10 scanners give 200m range, 100 give 400m range, 1000 give 600m range, 100,000 give...