Not a big fan of the PWC personally. Nice thing for someone else to own and get to play on,
but would get bored of one pretty quick myself. Would rather drop the 20k on a second hand ski boat or a nice bow rider that could be used with friends for cruising and skiing. PWC's are nice out in the waves but get bored pretty quick just blasting flat water.
But that said, a mate owns Estuary Marine in Mandurah. Big Yamaha dealer. Rode the 1000cc 4 stroke yamaha (marinised R1 motor) bad boy last weekend at a test day. Nice bit of gear. Heaps of grunt (160hp) and good economy from the 4 stroke. The 2 stroke model had a little more grunt and a slightly more aggresssive turning hull design, but considerably higher fuel consumption. Would make a big difference to cost of a day out. Roughly say 20 litres through the 4 stroke and 50 through the 2 stroke.
Happy to provide an intro if you are keen Jonno. Has demos as well if you want to test drive.