Nifty Pre-Market View.

Nifty, holding 5566 lows, has done an upmove to 5666, (i)/a and a corrective fall to 5580, (ii)/b and is poised to move higher in the next upmove (iii)/ c towards 5679-86 zone, the last ivth sub-wave.
If "c", it should limit itself to around 5692 and anything beyond it would make it a (iii)rd wave.
Weakness would be below the channel bottom @ 5580.
.......................................................................................................................
You have stated the reasons for your stagnation - Indiscipline.
I would just add..."Get Rich Slowly and Quietly".
Follow the system you have established. It'll take care of returns. Your job is to simply obey its commands and execute and Not Think. Keep your ego out of it which brings in greed and fear.
If Arjuna who was mentored by Lord Krishna fumbled often..wavered mostly, we, mortals, should then beware of the power of our own ego in our destructions.
Part book...re-enter...part book again..n number of times..stay with SAR till the end is the only mantra to be followed.
A true karma yogi will lose himself in the fire of act. Just pay attention to the acts..objective acts..loose your "self".