Yup. For a mostly stock 2-vave PI motor, I'd go with the stage 2 PI cams, found here:
http://modularheadshop.com/Cams.htm.
And don't skimp on degreeing them in. Either get the tools to do it yourself, or pay an extra $150 and let Nick @ MHS do it for you. My cams from MHS were
6 degrees off.
Granted it was 6 degrees retarded, and thus wouldn't hurt anything, I would have lost a lot of potential power. And if you were to get a set that were 6 degrees advanced.........you can kiss your intake valves goodbye.