84 VF1000F Brake Upgrade Mod Questions!

Hey everybody
The season is slowly creaking to an end and I'm already mapping out the mods I want to do to my 84 VF1000F. First and foremost I'd like to upgrade the brakes. Yes they were top of the line in 84, but with the bike being pretty heavy, and me liking speed and living in NYC I'd like a bit more confidence.
So the questions are
1. Are there any bolt on caliper options that work with the existing brake mounts? Brembo would be cool, but not really necessary. Modern is the key.
2. Is there a modern front end that works?
I'm still undecided when it comes to the little 16" up front. I've done a bit of searching through the site, but if anybody has any pics of an 18" up front that would be great.

Thanks and looking forward to the responses

 

The 17" F2 front wheel will bolt up with some parts from Daugherty Motorsports, Daugherty Motorsports - Motorcycle Suspension Performance and Modification

Not sure about bolt on calipers. The RC51 front end swap has been done.