keep your prop small at first. Maybe even an X440. The 7 XL is a good motor, but it's a sprint motor (i.e. racing 1 min heats). You'll love the speed, but your runtime will suffer, and heat will be an issue.
Whatever you try, bring your boat in frequently on it's first run to check for heat. It's a pain, but you have to do it. That way you know for sure what your set up is doing.
Also, keep in mind that sprint boats that run 1 min don't run out of batteries at 1 min. That's just the thresshold where heat can start to damage equipment. Roughly, a good sprint boat is running 60-70 amps, which will yield a run time on 3300's of about 2 min. But, running that many amps for that long will burn something up. Hence the 1 min comments.
To get good runtime out of that motor (and less speed), you would have to gear it. I don't think that's an option in the boat you have. But, maybe it's an option in the next boat you get!!
Who recommended your setup? If set up right, it would be a very competitive sprint boat. But, as mentioned, not for sport running.