Yeah, get the 800, with your size it'll be a much better fit. The SJ would work as well, just depends on your drive to get into a smaller sized wetsuit.
Pipe - Factory pipe is the hot ticket for performance on either of those skis. Bump the compression up, and send your stock flywheel out to...