Sounds like we're in a very similar place. My background not in finance. I also started trading part-time in 2020 but haven't found consistency yet. I also think I know exactly what you mean by "fighting at the borders" of your system. Although I've built a pretty detailed system, I still find myself on too many days convincing myself today's scenario is something my system hasn't yet "accounted for," and that leads to some discretionary judgment (which either works or doesn't) followed by an updating/expanding of my rules after the fact. That dangerous habit has led me to seek out a more systematic approach where I have less and less say over things, and yet there always seems to be these moments where interpretation (of single trigger candles, or larger patterns) is needed, and that's where things usually go awry for me. I still have a long way to go, I've come to realize, but I do think backtesting and writing out your plan IN DETAIL holds one more accountable and thereby improves discipline. As others have said, you won't obey a system you don't believe in, and that's where thorough backtesting comes into play and can really help your discipline improve. One question for you: are you trading multiple things? For relative beginners like ourselves, I'm a big believer in really getting to know a single instrument, only trading one thing and backtesting it in a way where you get used to all its main scenarios, its quirks, etc. This is all very general, but hopefully helpful in some way.