Cam swap without pulling motor

I’d apply whatever $$$ the 1.6 changeover would cost towards bumping up the CR(head milling, thinner gaskets, etc).
this. this right here.

you've got bigger fish to fry than to be faffing about with rockers. that good money only spends once so throw it where you can maximize the return.