Which leaves me wondering about Goldberry. My favorite theory for a while was that they were Aule and Yavanna on vacation (stolen from a web page which backed it up pretty impressively), but upon consideration I canNOT picture Aule singing Bombadil-style.
This is a good discussion on Tom:
http://www.glyphweb.com/arda/t/tombombadil.html#riddle