May or may not be relevant, but my torque-sensing hub-drive surges only when I find myself in (a) too high an assist level, (b) too low a gear, or (c) both for the total resistance at hand.
Simple, reliable fix (in my case): Reduce assist, upshift, or both.
Whether or not that works for the...