I've been interested in one or the other recently also and the way I figure for myself is:
kayak if for the ocean just to paddle around, ride some waves and what not.
Canoe if for rivers or lakes--calm fishing sessions or whatever or if you need to take a small amount of gear with you.