I had a local shop do the fork and replaced the rear shock with an Ohlins.
The shop
GP Suspension > The Cutting Edge In Motorcycle Suspension recommended against using disc emulators in the fork.
Instead, they welded up the valving holes in cup at the bottom of the fork, changed out the fluid to Ohlins 10wt and installed .9Kg straight rate springs. Their experience on multiple tracks has given them more insight on this than I have, so I agreed to have them do it this way instead. Seems a lot of FJR riders come down from Canada to have this service done at their shop.... mine was the first FZ6 they had serviced; but the fork is extremely close between the two. The leakage past the seals in the cup provide adequate rebound control, and I have no complaints with the work on the fork.
The Ohlins was ordered with the correct spring for my weight, and I had them set it up with 10mm extra ride height.
Static sag is now the ~20mm at both ends as it should be, rather than the 2" that happened with the OEM setup. The fork is much, much, much better than OEM. Nearly zero dive until you really start hauling down on the brakes. The chassis is much more precise in holding it's line, and there is pretty much zero vagueness out of the front end.
The rear is
much better. I ride on some rough choppy pavement, and the only way to deal with that with the OEM shock was to have it maxxed out on preload. Made for some sh*tty action, but at least it was predictible.
Now, it's stable, and runs on rails. I can carry at least 10 MPH more through the roughest stuff, and easily 20 + on more open roadways.