Trimming the boat properly should show a BIG difference in speed and performance. Either you're not doing it as well as can be done and/or the water in the bracket is the issue. However, we're back to a another variable as you mentioned "a ton of water" came out - that's too subjective. Fix the leak and go for another ride, though - see what happens.
You need to physically check what size prop you have. This is a variable and without getting us that info, we can not be as much help. Price is not important.
