Yes, the latter sounds more like an ultimate solution.
But shall I quickly apply the former solution and close this issue and then start a new issue to cover more perf tests and threshold tests?