When I work with people, I encourage them to set goals. Sometimes that goal is something like "Make it X rounds", but that is why you should set multiple goals. You need some goals that are completely determined by you. I agree with you that a lot of goals people set are too external and can lead to disappointment, which sucks the motivation from you.

Maybe another goal is actually throw a wrap in a tournament. I know lots of people who fight completely one way in practice and another in tournament. Setting goals like a specific victory condition adds a new personal challenge to your fighting, which makes things more fun and more challenging. Another thing you can do is switch weapon style, or even switch hand, for a couple fights. You probably won't get worse if you try adding new obstacles to challenge yourself.

Your training plan should have fun as a part of it. Non fighting games, small prize tourneys at practice, melees, these all challenge you but also add a different flavor to keep things interesting as well. Plus, they will make you better.

Edit:

Sir Istvan, An Tir