I suggest to add a new stop to the backtester : a comination of X% gain and y% trailing loss stop( as opposed to regular loss) , to be triggered based on whichever incurs first.