Maiar or Man?

[Glirdan]

Ok, I'm going to get (pretty much) right to the point.

We all know that after the War of the Rings is over, Elrond and Galadriel return to Valinor as they are of the Noldorin race. Arwen gave up her spot on board the ship and Frodo went in her stead. Bilbo went because he was a bearer of a Ring of Power and Cirdan went becasue he was steering the ship. Gandalf returned for two reasons: he bore a Ring of Power and he was of the Maiar.

Now, that all said, my question is this: what happened to Gandalf once he arrived in Valinor once again? Seeing as he died once before after the battle with the Balrog, when he returned to Valinor on board the ship, he was still in the form of (technically) a man. Now, my question, and this is completely a personal belief, is do you believe that Gandalf would have returned to the form in which he had as a Maiar? Or do you believe that he would have died and left the World forever seeing as he was in the form of a Man?

This question has been burning in my mind for quite some time now and I would really like to hear other people's opinon's on the subject.