Looks like an excellent build!
I've got a 22ssbxp with mostly the same options and a Yamaha 150. The 150 has been very good for us and we can pull tubers and skiers etc well. That said, while I'm not sorry I didn't get more HP, you never will have too much. If you are unsure, go for the 200...