Crossing the Bar

Crossing the Bar talks about an aspect of death, and the way he might want to die.  Question 4 asks what "that which drew from out the boundless deep" refers to.  I think it refers to the tide that goes out onto the beach only to go right back into the ocean.  The "boundless deep" must then signify the ocean as the ocean is one thing of which the tide comes back.  Towards the end of the poem, "Pilot" is capitalized because it refers to God, the pilot of all events and creator of the world.  The setting must be at night because there is high tide and the sunset and evening star.  "Crossing the bar" must mean passing from life onto death as the poem states that the speaker wants to see God once he has "crossed the bar."  The one thing I don't understand is how the speaker wants to die.  Does he want to float away in the ocean, or does he just want a peaceful death?