You are right.
Have a plan, know what you do wrong, work on it and eliminate from your performance.
When I shoot a match, regardless the level I follow certain pattern:
1. Safety
2. Accuracy
3. Mental preparedness for every stage. Screwing up one stage is not end of the world. I sometimes get so upset with me, especially when making simple mistake. I let it out of me and next stage is a new game.
4. I pay money to compete, I hate throwing the stages, always play till end.
5. After the match, analyze it on the way home. Think what went wrong, listen to your friends, and work on it.
6. Have a journal, which includes dates, matches, how many rounds, practice/rounds and most important honest comments.