I've had very good service from both Cascade Diesel (http://www.cascadeengine.com) in Seattle, Washington, and Cook Engine Company (http://www.cookengine.com) in Portland, Oregon.
-tk