Some years ago I wanted to upgrade to the FZ1.
Long story short I gave up after I found out that many claim the range is at least 20% lower (smaller tank + bigger engine), and instead upgraded the suspension and brakes on the FZ6.
Today, the only Yamaha I'd really upgrade to would be an XSR900...