As some have clearly mentioned here going from a 15 to 17" pitch means nothing if thier not the exact same prop other then the pitch. I went from a 19 to a 23 pitch but totally different styles of prop just for fun since I don't pay to test out props. Well my top end was exactly the same @ 50mph and within 50 revs of each other. Boat set-up was identical to make certain I was comparing fairly.
Just some food for thought and the problem might be simpler than most think.