Hi Mike,
I think the text layout was copied over from wherever you copied this link from, that happens sometimes.
Although the batteries aren't that suitable for it (a tad bit too high voltage), I think this motor will get you right where you want to be:
1100Kv motor @ Hobbyking
At 1100Kv it will give you about 13200rpm unloaded @ 12V, which is a bit higher than the 540's from your link, and with 102W per motor these babies should not have even a bit of a hard time pushing your model forward. I have motors of the same series in two tugs and actually have the same motors ready for a fast utility boat with twin screws, these are very lovely motors IMHO. The only drawback is they are mounted "the wrong way around" so you'll have to modify your motor mounts.
This could also be a good choice, being more suited for higher voltages and roughly the same RPM as the 540s:
1000Kv motor @ Hobbyking
I don't know this motor personally though, so the number of windings will be sort of a gamble… I can only say that this series of motors have not disappointed me yet.
Last option for my quick search would be this one:
1100Kv motor @ Hobbyking
This motor is hideously overpowered (which means it will power your boat with so much ease it can read a book while hammering along…) but gives you a motor that is designed for your voltage and the slightly higher RPM's for that bit more performance you were after.
As ESC I can recommend this little baby, although according to the sheet of the second motor a bigger ESC should be used such as this one. For both I recommend buying the Trackstar programming card (only one needed) to program them, it is a lot easier and it has more functions available than transmitter-based (beep-counting) programming.
This ESC should also do fine, although it is watercooled so maybe a little bit of a hassle. Again, order with programming card(although this card seems to be a bit iffy depending on the batch, mine works fine but the reviews suggest issues with a lot of others).
The advantage of HobbyKing are their prices; for the money of one Robbe Roxxy outrunner and ESC here in NL I can buy three, better, outrunners and ESC's, and then some, AND have it shipped here, and still have a bit left to spare…
The disadvantages are a lousy aftersales / guarantee procedure and long transit times (up to 5 weeks) when shipping from Hongkong – although they also have a EU warehouse but that is not as sorted as the Global one.
I would say that is enough food for thought on the late evenings for now
Check out the links and try to follow my train of thoughts on them, I think you'll find it pretty obvious if you compare the results with my checklist 
Good luck!