So finally after much thinking about it got a Niner chromoly fork from the bay, fits like a glove.
Fork did drop the bike about an inch but at almost 490mm from axle to crown, it's a happy medium from the original 515mm pogo suspension. Bike went from just over 32 lbs to an even 29 lbs and feels like a totally different animal, very responsive and tight when compared to the Suntour fork.

Now, Why can't I upload a picture?