Rebuilt the front forks with Progressive springs and new fork tubes from Z1. The Z1 tubes are really nice and fit perfectly.
I spent a bunch of time getting a bunch of little time consuming bit back together and ready for instal. New wheel bearings installed front and back, alternator cover put back together and tested, installed APE extra plate clutch kit, all new seals replaced in all covers, all new rubber grommets in the frame, oil tank, and battery box, Ricks reg/rect bolted to the bottom of the battery tray, Rear brake rebuilt... Goes on and on but this will make rebuild move along quickly once I get it into a roller this coming weekend.
I have also decided to go with NOS stock full fenders front and rear rather than bobbing the back, thoughts?