Ok I'm taking a break. I might take another look later if we haven't moved.
e5/e6 is perhaps risky, I can't say with any certainty if giving up the pawn will work out for us. But I don't see a better course of action. e4 is a problem for us, if we're going to lose the e-pawn then better to do it on our terms. I certainly don't like the idea of having to play Qc2 and Bb3 to protect the e4 pawn, that's far too passive.
e5/e6 will cost us a pawn, we should only play e5 if we're happy with that.
I still like e5. I just think we have to give up the pawn with e6. But this seems a lot, lot better than spending the middlegame defending e4. With e6, we weaken his g6 pawn, so that gives us a way to attack him. I'm definitely happy to give up the pawn with e6 after e5 Nh7.
If he doesn't play Nh7, then we might not need to give up the pawn.