I'll second this. Even though you said you're mainly not looking for pre workout supplements, N2KTS worked really well for me on days of hard MMA training.
The niacin flush and blood flow increase, not to mention the main formula which is awesome, gives you a nice kick in the ass.