058 - 06A internal parts interchangeability

Hi all,
I am trying to find an 058 1.8T engine from the early Passat or A4 B5 for a project but they are starting to get scarce, i have seen bare 058 blocks available for cheap or the ADR n/a 1.8 20V which i believe is the same 058 block? Will the 06A internals (crank/rods/pistons) fit the 058 block? I guess with a bare block i am still going to need the intermediate shaft bits for the oil pump and a sump pan.

thanks