For waterdrop, I personally suggest the opposite. Instead of waiting, practice leaving the spawn optimally so that you can begin your dive ASAP. Also, you used to be able to line up your drops, but nowadays it's better to just jump and then adjust your position midair.
Finally, use 1.8; 1.7 has...