You could very well be using both and you could use both during a fight.
Energy fighting is typically using and regaining energy to keep on top of your opponent and/or press the attack.
Good energy fighters will Boom and Zoom.
Diving down on an opponent is the "Boom", which collects energy (speed). Once the opponent avoids your attack (or dies), you "Zoom" back up which transfers your energy (from the Boom) back into altitude or an advantage on your opponent.
Energy can also be used at co-alt. If you are in a Tempest cruising at +400 mph and you encounter a Spit co-alt, at the merge if you zoom up, you are using your "energy" to try and gain an altitude advantage over the Spit to begin the fight.
I would say that "energy" really boils down to speed ... and when energy fighting, you are hoping to use your speed (it doesn't have to be real fast), in comparison to your opponents speed to beat him.
Angles fighting is using angles, against your opponent, to spoil a guns solution or gain an advantage or both. Both meaning, you can present an angle that will prevent a guns solution and at the same time be putting your plane into a position of advantage at the merge. The best case example is the HO. If someone starts to fire at you at 1.5 out, go off angle on him (left or right). He will more than likely not react to that move due to the fact that he is concentrating so hard on making the HO. As he gets to within 600 out start to turn into him (lead turn) ... at this point he can't hit you, and you are now executing a turn and he is still flying straight. At the merge, I will then pull up, left or right, depending if my lead turn was left or right. As I come over the top, they have no clue as to where I am so at this point, he is effectively dead ... if he sticks around. So I presented an angle that spoiled his shot and at the same time set me up for the kill.
When I enter a fight, I like to be "off angle" to my opponent. This prevents the HO (as described above) and it will either give me a clue as to what he might be thinking when he turns (angles) into me, or if he hesitates to turn into me, I will then turn (angle) into him and try to setup a lead turn, which will get me on him quicker than he can get on me.
When I fight someone, and its a long fight, it's due to both of us presenting and using angles to both prevent the kill or setup the kill. Mind you, energy is also playing a part in this type of fight too ... because speed also dictates what maneuvers you use to present your angles.
Hope I didn't confuse you.