I have been having an issue with my local yamaha dealer installing my propeller (Vmax SHO t2 25p) incorrectly. I want to make sure we order the exact OEM parts required to make this thing run correctly. If I end up with a t2 prop instead of a t1 is the hardware the same?

Going from this diagram, I will need:
Spacer1 https://www.simyamaha.com/THRUST_WAS...5987-10-00.htm
Spacer3 https://www.simyamaha.com/product_p/60X-45995-00-00.htm
The prop according to this diagram is a T1, then:
Spacer2 https://www.simyamaha.com/Yamaha_Pro...5997-01-00.htm
Small Washer https://www.simyamaha.com/Yamaha_Pro...0-18200-00.htm
Prop Nut https://www.simyamaha.com/Yamaha_Pro...1-18m04-00.htm
Cotter Pin

Are these correct? or is there a different diagram for a t2 prop?

Also, are these in the correct order?
Thanks!