You did fine. There's nothing wrong with using water, as long as you don't use a nozzle with pressure, to wash off dirt and soap. That's no difference that riding in the rain.
Also there's nothing wrong with using WD-40 to clean. It's not a lubricant so remember to apply lube after the cleaning.