Modify an Existing EA by changing it to trade a No repaint indicator

I would like the Existing EA I have which has two indicators (coded) removed , please make sure this does not effect the new EA from operating correctly.

Please back test/ forward test the No repaint indicators that will be coded to this EA to verify it does not repaint.

Your honest opinion will be required please.

The EA already has most of the settings coded I require like  SL , TP , BE, Trailing stop , pair selection for trading , Lock to Account/time expire all inputs etc.

It will need filter indicators and a few more settings and modifications coded like Auto Gmt Time and settings to trade selected sessions, eg London etc , auto avoid News trading setting , mobile push notification.

The EA needs to close the previous position and open a new position at the close of the candle when the indicator locks in the new arrow to confirm the trend,

I have found the candle jumps at the close /open of the candles sometimes and the arrow does not print or the EA misses the trade or the EA trades and there is no signal arrow on screen.

This is a problem I have seen with this current EA that I have (maybe its more of a problem on the smaller time frames) needs to be sorted out by forward testing.

The new indicator is a no Repaint indicator so please let me know as I would like to test it as well as you please. 

The EA I have at the moment does not reopen another position if I close the position manually it will wait for a new signal/arrow also

It will not trade as soon as it is attached to the chart until a new signal /arrow appears .

I would like it to remain like this please. 

I would like the EA to have an additional settings to trade only when (for example 1Hr & 4Hr) HTF Arrows are in agreement (same direction) for trading trends.

I will require Source code at the completion of this order.

Delete all indicators, coding ,provided after this job has been completed please.