I have an XR2 on my P20 (200HP) running a Laser II 22 pitch prop. Bolted straight to the transome can trim all the way up flat out and its completley stable on the river. Taz also complains of Chine walking I would try a Laser II prop.
Submitted this thread when i brought my p20
I like to wakeboard and ski behind mine as well though and the Laser seems to be a good alround prop.
Played with loads of Props on a phantom 16 and a Yamaha 90 HP.
Took ages to find the right one ended up with a Ballistic raised the engine right up too. These gave us max top speed but wouldnt pull a medium sized bloke out of the water on a wakeboard.
If you want speed Burty seems to be the man. But not sure if your Yamaha will rev and provide the same sort of speeds. When we chnaged the yamaha on the Phantom 16 to a Suzuki V4 100HP the boat handles and rides completly differently to the 90 Yamaha. It actually goes faster (just) but feeel way more stable at speed and rides more horizontal. Therefore what ever setup burty has may well be compleely different to your own simply because the engines are complety different.