Allow me to amplify..
What I am considering is starting with a stock 1981 motor and replacing the entire top end (head, jugs, pistons, a new set of rings, new cam chain) from a donor 1978 '2E' onto the bottom end of the 1981 motor.
From what I've seen looking at the fiche, most of the mounting brackets and bolts are the same. Of course this would mean that the CDI would be replaced with a breaker-points setup.