I think the timer should be lowered, that's it. Maybe down to 10 or 15 seconds? 30 is a little extreme, especially when the damn mob lands heavy seconds before it de-aggros...