From the pics and description, I think you did very well!
I have an 87 that has been trouble free for a couple thousand miles now.
I would add a Ricochet or similar bash plate to protect that left side engine cover from damage, they are No Longer Available from Yamaha, and getting rare on EBay and other places.
Enjoy!