I think with 2x Diplomat you do not need an additional 2x Groundshift.

At that point, you likely have it for Moonstalker? However, if you put in 2x Assassination instead, you can have nearly the...