I'm lazy, really lazy, and I also hate desoldering. I ended up not reusing my LCD from the 4.0 and picked up a new one, to avoid cursing at trying to de-solder the old LCD.
Other than that, reused my ATMega and RPi - disconnected the RPi from the 4.0, mated up to 4.2, and voila. Everything came...