What you are doing is essentially correct. In liquid instruments like ES, this should get you pretty close to actual live trading results (backtest ~ live). Of course, if you wanted to be absolutely conservative, you would also include all trades that only touched the entry (not traded through)...