Shorts and rash vest - or a dry suit. Nothing in between in my book.
I use one of these -http://www.polarbearsq.com/rec-product.asp?pid=721&cid=78 - but the Genisis version.
For waterproof coats and leggs try Decathalon, some great deals to have there