I think stock bore higher compression pistons would work. If you went with a higher compression with a bigger bore it'd make sense just to machine and build the head while doing the block.