Here is my 2 cents...
I've had a Ta-31, Ta-31F, and currently have a Ta-31A. (Triangle). My current "main carbine" has an Aimpoint M3 on it that replaced an EoTech.
For what you describe, it would be hard to beat an Aimpoint or Eo. I like 'em both, like the Aimpoint better for simple controls and better battery life. The forthcoming Eo looks awesome though, still has those push button controls that I was glad to get away from.
Of the ACOG's, the "F" model would be my absolute last choice. While it is precise it was way too fine of a reticle for me. I love my "A" as it has a big, thick reticle that is easy to find with your eyes and still has a precise aiming point. I liked the doughnut too, but for me the "A" is better.
I do not have the magnifyer for my Aimpoint but it sounds like a good idea. I believe somebody sells a mount that flips it out of the way or in front of the optic and that seems like it would be worth checking out if I was going that way.
Good luck, not a bad choice in the bunch, you might as well Get Both as you will end up with them anyway! dg