Bill,
I also have an M/T electric prop. I discovered a long time ago that my landings are more predictable if I switch the prop over to manual mode prior to entering the pattern. I typically level off about 3-5 miles out, change the prop rpm to 2100, wait for it to re-adjust itself, then switch to manual mode. This makes the prop behave like a fixed-pitch, and from this point to touchdown I fly it like a fixed-pitch prop.
Regarding your surging issue, Tracy suggested to me to simulate a landing, but at a safe altitude. Set up as if you were in the pattern preparing to land, and then put the EM-2 into auto-tune mode. Let the EM-2 tune the settings which are impossible to tune on the ground. Worked for me.