I was able to make it so that I can run in any number of setups without having the re wire.. I can run inline, battery forward and the ESC mounts between the waterfall and the battery. If I move the battery back, I need to put the ESC on top of the battery, keeing the ESC as close as I can to the waterfall and still clearing the body. If I mount the battery sideways (stock) I can move the ESC to the top of the battery or in front of it.
When I wired the motor, I just left a little extra wire, then spun the ESC a couple of times to twist the motor wires... This takes up the slack and I can go back when I need the extra wire. Seems to work well for me.