Oh, and my advice on katas, from one who's judged quite a few hundred:
I was trained from the start to incorporate 5 elements: Power, Focus, Concentration, Balance, and Form. I certainly think all of these are vital. Being from my original system, you may have been taught the same thing.
However, don't focus too much on just these 5 elements. The biggest problem I see with lower ranked katas is that the student is too focused on proper technique, trying to show how "perfect" he/she can execute the moves. Consequently, the kata looks very stiff. After watching a few of these, it's hard to want to watch another.
Instead, remember that a kata is supposed to be simulated combat. In a fight I don't focus my mental energy on sweeping my foot in an inside arc as I slide from one zenkusta-dachi to the next, making sure I execute my reverse punch by rotating..blah, blah, blah.
Make your kata "dynamic". By that I mean put yourself into a mental state that is closer to what you would be in during a fight. There is an intensity there that will come through. Let your techniques flow on their own, relying on your training. I would rather see a karateka who is "involved" in their own kata rather than trying to impress me with their stance.
Of course, I don't mean you should be sloppy in your technique. I'm saying that you should practice your katas for the tournament the same way. There are times you need to break down every little aspect of a kata but, in the tournament, let that preoccupation go.
My other advice on kata is to vary the pace. Too many ppl perform the entire kata at the same speed the whole way through. Why would I be impressed just because you kaiai on one of those punches when it was like all the rest?
Like in a real fight, sometimes you move quickly and sometimes you don't. Emphasize speed and power on important visual parts of the kata and wind down/up at other parts.
And lastly, in kata and kumite, here's a small thing that makes a big difference: Relax your shoulders. Most people, when they get tense, tighten across the shoulders and it affects everything. When the timing is right, relax the shoulders ands release the tension as if you were sighing. It helps; you'll see.