While I would actually like to see number 3 with WW2 surface ships, I would more so like to see a sort of combination between an RTS and an FPS.
What I really want is a new Hidden and Dangerous game: the kind of shooter where you get an objective and have to create a strategy to complete it. I like being able to choose everything, from the weapons my team uses, down to the uniforms. And open maps are key.
My biggest pet peeve with shooter games is when it feels like you are running down a corridor.

I've been playing Sniper Elite v2 lately, and the biggest thing that annoys me with it is things like barriers that prevent you from going any place except the path the game wants you to take, and some of the barriers are kinda weird (one example is a road-block waist high that you can't vault, or another was a fallen wall, which only came up to my ankles, which you could not tread on at all

). You also can't climb on anything unless it is specifically part of the path the game wants you to go down (keeping in mind, Hidden and Dangerous 2 came out about 9 years earlier, and lets you climb on almost anything you can reach).
EDIT: lol, I typed "road-block" as one word, but the forum censored "ad-block"