What solenoid did you use? I was looking into this and struggled to find an affordable valve for the water, the zwave switch is simple and I love that part of this solution!
I've been messing with a 12V DC valve by SparkFun as well. It runs around $8, but it doesn't hold up well under high pressure. Great for a low pressure/gravity fed system though.
Also, you don't have to use zwave for the plug if you don't want. There are all sorts of remote controlled outlets now for whatever wireless standard/protocol you want to do your automation over.