It sounds like you have a great system.
Certainly my goal is to trade without emotion, but it is not always possible. My real goal is to feel the emotion, recognize it for what it is, and GO THE OTHER WAY - but only at the most extreme fear and greed areas.
Well, I spent over a decade to learn and unlearn many stuff while building my own system. Then, I spent the following years to observe, understand and improve my system in order to see recurring patterns happening almost everyday..... So far so good and like others said, if it aint broke, don't fix it.