Gandalf based on Kalevala's Vainamoinen?

Greetings all Tolkien fans!

I'm writing a research paper for my English class, and chose to research A) the various things Tolkien "borrowed" from sources such as Beowulf, Heimskringla, Edda and Kalevala, and B) especially focus on the similarities between Gandalf and Kalevala's Vainamoinen.

I was sent here by Marileangorifurnimaluim, who suggested I specifically ask help from Mithadan, Gilthalion, The Barrow-Wight, and Rimbaud. Of course, anyone who can help me is welcome to do so.

As this is a research paper, references to primary or secondary sources published in books or journals would be appreciated the most, but I have used some web references as well on topics I haven't been able to reach in hardcopy.

Here's a quick recap on the topics I'm covering:
- Tolkien was an expert on Old English and Beowulf, an enthusiast of north-European myths and sagas in general, and a great fan of Kalevala and the Finnish language
- Names, places and words from Beowulf (Marilea was of great help here)
- The dwarves of The Hobbit got names from the Edda
- Gandalf's name comes from the Heimskringla
- Turin Turambar based on Kalevala's Kullervo
- Quenya inspired by Finnish
- Similarities between Iluvatar and Kalevala's Ilmatar, and Feanor and Kalevala's Ilmarinen
- Gandalf similar to Merlin, but much more similar to Vainamoinen
- First literary mention of wooden staves being magical in Kalevala (?)
- Both wielded a sword (and Glamdring sounds greatly like swords in Beowulf)
- Both immortals, born at creation, power not learned but innate
- Both primarily follow the archetype of "wise old man", but both also break it by being the focus of action
- Both have a supernatural steed
- Both get rescued by a giant eagle, related to a near-death experience

If you have rebuttals or additions, please post here or PM me. Thanks!