Seems you want to change things as little as possible, so I thought I would throw out another scenario. If your current pistons and rings are in great shape, you can pull the heads, check the piston to head, have them cut if need be to max out compression, and adjust the piston to head clearance a bit if thicker than stock gaskets are in it now. Then add a good cam, tune it, and enjoy.