Correct. I recommend soldering in a socket rather than soldering in the xtal then you can replace it.
Remember if you put an xtal in with the wrong orientation it will break the xtal so take care.
See if you can find a decent heatsink for the 060 which has a retention mechanism which fits well (486?, perhaps the old one off your 040?) Use the RIGHT amount of thermal paste. Not too much. Then if you want to go to 80MHz later you can without having to remove the CPU.
