So the Mk17 upgrade ended up not happening; the tech was putting together a quote for me but I figured the money would be wasted, as I don't dive in cold water. However, the second stage upgraded quite nicely for $20 worth of parts.
Also, it turns out there are two Mk11's running around out...