I've got a bit of feedback, actually. Maybe it's just going to take some getting used to, but so far I find the angle names very visually confusing. "1 vs 1 v 1" -- it's the version number that keeps slowing me down. Do you need that? I think the little parentheses with (2 ent) or whatever is enough to distinguish between angles.
So it'd be, for instance: 1 vs. 1 (2 ent)
Instead of: 1 vs. 1 v. 1 (2 ent)
Maybe I'll edit in my game and report back!
Anyway, great idea, very happy with the streamlining overall. Thanks for the work!