You mentioned about using 2% risk, but your strategy says that trades can exit by MA conditions. So there will be no set SL. How do you want 2% to be risked if trades will have differing losses? Do you have a formula you want to use for this money management?
Also, in the strategy tester, how specifically do you want to know the pips generated by each trade? For example, printing to the log or what? And can you give a quick example of what you mean?