Surly 1x1 or Instigator front fork for the win. The 1x1 is about perfect if you're a bigger guy and compress the suspension when sitting, the Instigator is a dead match dimensionally to your Suntour fork at rest. I did the same replacement you're pondering on a Gary Fisher and loved it I went with the Instigator fork since my Suntour had no give to it at all.