I gave up on the 'eco' remedies long ago. They might drive the adults away for a while, but do nothing for the eggs, thus it never ends.
I started using forbid 4f and problem solved, with a single application.
It is systemic, so it cant be used during flowering. You just spray it on the...