If I were you, the only change I'd make is getting a Surly 1x1 fork, or else find out if the zion 26" rigid fork has clearance for a 29'er wheel. Most due with the suspension correction, I just only happen to be sure about the Surly one. That way you don't screw with the geometry (raking it way the hell out) quite as much.

A rigid fork with a 20mm axle... Gah. Just go suspension from the start if you're going to do that. There's a reason there aren't many of those available. And the resale on it would be horrible.

What are you going to be riding trails with this thing or what? Just curious.