First up, I just sent the email to the Trolls with the Gillette map image. My chat with plako this morning reminded me about that.
Anyway, had a decent chat with plako again this morning when I got to work.
The first topic of our chat was that he said their C&D department believes that TEAM is also working towards the Great Lighthouse. We get ours in 5 turns (and there's nothing we can do to shorten it) so hopefully they aren't closer than that. They know TEAM has Sailing, and they're pretty sure they have Masonry (but not positive).
Now for the important part. They're looking to have a NAP until T110 (it's T67 now) and I agree with that.
While we were chatting about Gillette (they're nearing NAP re-negotiations) and asking if we had a NAP with them (ours never got finalized), it was decided that we would both discuss with each other before either of us sign a new NAP with Gillette. Basically, we like the idea of agreeing that we keep each other informed of our negotiations with this annoying little neighbor between us.

The last thing I brought up was the fact that in order to keep graphs with them I've had to a couple times put EPs into them. He said that they're currently spreading their EPs across all teams, so that was probably why. So we added to our agreement that neither of us would put more EPs into the other for the duration of the NAP.
So this is the final agreement proposal (which I already agree with, so just need the rest of you to decide if you agree):
NAP until T110
Notify the other team of any NAP-related negotiations with Gillette for the duration of the NAP
No putting of EPs into each other for the duration of the NAP
If this sounds good to you guys, we can let the Trolls know that we're good with it. He's proposing this to his team today as well, but he's also pretty sure they'll be ok with it.