Pistons are the better option, but shaving is much cheaper (much depends on the quality of the pistons, cheaper pistons and rings might not runa whole ton more than the machinework involved with shaving). Beyond a point though shaving won't help. For most heads, to drop the combustion chamber by 1 cc you have to shave approx. .005-.006. I don't think you'd want to shave much more than .030 (though Hearne did his .060).
5-6 CCs is worth about a half a point in compression max, and get you roughly where you were with those 58 cc heads. If you have good stock pistons (68's should be pretty good), that might be fine and I would think get you in at least the mid-9s and potentially into the 10s.
I'd say if the things already apart, go ahead and get some inexpensive performance speedpro pistons and then you can choose whatever compression ratio you want. It won't cost you much more or take much more time.
If you're like me and don't want to dissassemble the rotating assembly, shave it .030 (i did just that a few months ago). You'll save a little money and a lot of effort.