pistons, heads, both?

If you're on a budget I would zero deck the block and run magnum heads with pistons. You'd need AMC lifters and maybe custom pushrods. You'd run higher valve lift instantly with the 1.6 rockers, better head oiling, bigger valves. Of course, you'd need an intake or find a machinist to drill the heads to accept an LA intake.