Fat Tone

Hi new to the site - I have just purchased a Yamaha XJ900f on a 93 plate as a project bike; I need some help with sorting the engine - its been painted black & gold and looks a real mess! so I have been considering my options 1/ strip it down and get it Auqa Blasted removing the paint or 2/ buy a replacement engine - I found a really nice XJ900 Diversion 1999 but was wondering if it would fit the XJ900F Frame