I believe that the valves are the same between the 2.0 5K diesel and the 1.6s of each variation.
I think, but it's murky, that the 2.0 pistons interchange with the 1.5 pistons. Apparently, despite the identical bores, the 1.5 and 1.6 pistons do not interchange. Not ever having had one of each side by side, I can't say for certain.