I don't think you'll want to go much faster with wake surf setup (boat lean). What's your RPM at surf speed. We just ran 5k this weekend and want to get a different prop because RPMs were around 34-3500. I would like to keep it around 3000 RPM under load.
Also some additional weight in the front may help you plain easier. We run a total of 2000k in our bow.