Ent-Wives

[Finwe]

What about if you consider the possibility that Goldberry was intended to be Yavanna?
After all their descriptions are quite similiar.<Taken from a Gene Hargrove essay>

In another guise Yavanna is described as a tree

... crowned with the sun; and from all its branches there spilled a golden dew upon the barren earth... but the roots of the Tree were in the waters of Ulmo, and the winds of Manwe spoke in its leaves. (Silmarillion, p 21)

Compare this with the description of Goldberry:

... her hair was flying loose, and as it caught the sun it shone and shimmered. A light like the glint of water on dewy grass flashed under her feet as she danced. (Fellowship, p 155)

Tolkien also mentioned that the Entwives were "loyal" to Goldberry whil the Ents followed Olwe.
Surely this would open the possibility of the Entwives following Goldberry to the shire.