Just an idea but wouldn't it make for a better game if weapon convergence was very slow without lock and very fast with lock?
The pinpoint skill could even be reactivated (as I heard it currently does nothing) which would improve both locked and unlocked convergence speed.