i use trend following strategies as well... What I do is, I'm in a trade which is defined with a trend, then have within your strategy to add to the position at short term panics.
Also when my strategy is almost to switch the trend very close of a stop, with a very small risk it can add...