If it's going to be several years before you are ready for the motor why not consider cleaning the motor up and install as is. Get the moter running and find out how it runs and what needs to be done in order to make you happy.
You can do all this before painting and maybe save yourself some $$$$$
