Restart after 3 year storage

I'm planning on restarting my 1989 200 etlf after a 3 year storage. I've dumped all the fuel, change the big fuel filter/water seperator. Replaced the bulb and fuel lines. Planning on changing out the water pump (need the part number if anyone has it) and perging the oil pump. Would anyone recommend change the thermosat?
Also any recommendation on oil types...

[boats.net]

Water pump repair kit is number 18 at Yamaha Outboard Parts 1989 200ETXF REPAIR KIT 2 Diagram
Probably need to remove and clean carbs.
Use Yamalube 2M TCW-3 oil.
Add 16 onces of oil to a 6 gallon portable gas tank and run it on that until can make sure oil injection system is working and there is no air in injection lines.