Oh that's just silly. YES to Aulë=smith & quite definitely not one for woodland caperings, and Goldberry is pretty clearly a water-spirit not a woodland one. And why would they be there anyway?

If Tom was Eru, it would raise a load of questions about Goldberry... Probably nothing that couldn't be filled in with sufficiently enigmatic capering though...