Unless you only plan to go out in flat calm conditions I wouldn't rig the boat for a max speed configuration.
I owned a Deepsea and trust me when I say that improving topend will compromise the handling in rougher weather. I'd be setting it up for plenty of bowlift when you need it and that'll involve keeping the prop lower in the water for more bite when you're surfing down a wave with the engine trimed up in a following Sea.
I first had an 80 Yam 2 stroke on the back. The speed was OK but I had to back off quite often in the short chop following Seas we have in the Solent. Moving more weight rearwards helped quite a bit, the console was quite far forward with a large internal tank (90 litres). The Cav plate was level with the hull bottom.
After a year I then bought and fitted a 90 Merc 4 Stroke which was much heavier. I just moved some of the weight of equipement further forward, but the boat responded with much better handling in a following Sea (head Sea's were never a problem). Might have been a touch rear heavy with crew onboard, but as I used her Solo quite a bit I decided that this was acceptable. I tried like you to increase top end and ended up trying different props and lifting the engine too.
After some experimentation I decided to run the Cav plate level with the planing wedge and swap props deciding on what my load was and what the weather was doing (15" for heavy Sea's and Heavy load (crew), 17" for heavy Sea's and 19" for calm conditions).
I might add that all three props were Alloy ones as I couldn't see any major advantage to using Stainless props, this conclusion was decided after borrowing some props from fellow RIBnet members and doing back to back testing over a day out. The other advantage a alloy prop has it that if you hit something solid then it's the prop that'll get damaged and not the gearbox components and of course alloy props are cheaper to buy.
Obviously if you did something similar and kept a couple of different pitched props then you could also change pitches depending on what you were doing. You really should have a spare prop, so why not a different pitched one
Oh and I though I'd better mention before someone else does, that you should keep within the manufacturers recommended WOT rev range at all times.