It is almost always beneficial to go with a rigid steel or carbon fork. However, you need to decide if the cost is worth it. If you have the extra dough and love the bike, it very well could be. Plus, if you do it yourself you would learn a bit and that is always good.

I've never been a fan of suspension forks on bikes that primarily travel on the road. Heck, half the time I am on trails it is a steel fork.

What fork are you running anyhow? Does it have a lockout? Besides the weight penalty that would help a little.