I vote for the corgi, but then again, I'm a bit biased lol... Shippo has great energy, loves water, and I still plan on doing agility/flyball with him since I know he will excell at it. When the day is over though, he can revert back to being a couch potato. His coat is more work than a regular corgi, but if I brush it daily/every two days, it prevents all matting and it's silky smooth. Also, he does bark some when he's playing, but that's about the extent of it.
I know you said you were iffy with corgis, but if you ever did decide on one, you like long hair so... how about finding an accidental fluffy corgi from a good breeder? >^_~<
Eh, it was worth a shot lmao...