Yes. You might want to throw a bit of vodka or everclear in there too. Watermelon isn't the easiest to get out. Especially if you are following with a custard or something.
You are right. I can still totally smell the watermelon after just water. I just made limoncello so I have diesel which I think is like everclear!