I believe you are more likely to need a 19in or possibly even a 21in one. I would be very surprised if you don't easily exceed WOT revs with the 17in prop, only a sea trial will determine the correct pitch. In my experience a 2in pitch change will increase (lower pitch) or decrease (higher pitch) the maximum revs by circa 500-600rpm.
Was it your engine supplier who agreed to exchange the prop, if not be careful as any minor blemish might be used as an excuse not to swop it Also, I don't believe that a 17in prop is 'the only one available' with this engine, maybe it is all the dealer had in stock at the end of a busy season.
I hope my caution is ill placed, in my experience Suzuki dealers ar extremely professional and helpful.