Sam's final journey

[Lhunardawen]

But as for me, my heart is with the Sea, and I will dwell by the grey shores until the last ship sails. I will await you. (Cirdan to Gandalf)

Now what does "I will await you" mean as Cirdan said it? He would wait until Gandalf finishes his task and have his ship back to Valinor prepared by then? (Ooh...more Elven foresight!) Or is it, "I will wait, then we'll go back to Valinor together?"