I know this is more accurate than version 1, and in fact, I'm fairly confident that the chords are 
all correct, but there are a lot of minor differences from the actual recording, and certainly from how he
plays it live; for the sake of simplicity I've ignored the form chords are played in where it's not essential
and approximated some of the finger-work. I'm pretty sure these lyrics are more accurate than I could find 
elsewhere as well. I decided to write this as chords rather than a tab because the chords are easy and the 
frequent hammer-ons/pull-offs are mostly consistent. I wasn't so thorough as to give the timing for H/P-Os, but
here's a basic description that'll help you figure them out with a couple listens through the song:

For a singular G or the 2nd of 2 consecutive Gs, play with B open, then HO 3rd fret - this isn't what 
he plays, but the chord starts with open B emphasized, then open G emphasized, so it has the same effect.
For Bm, play on 9th fret (not relative to capo) with G 9th fret (as usual), then HO 11th fret and PO again.
For Dm, play with G 2nd fret (as usual), then HO 4th fret.
For the 2nd of 2 consecutive Cs, play with D open, then HO 2nd fret.
For a singular D or the 2nd of 2 consecutive Ds, play with G 2nd fret (as usual), then PO to open.

If you haven't read above this point then ignore the asterisks; they mark places that, by the above description,
would have a hammer-on or pull-off (in a loose sense - really I'm talking about general mid-measure changes),
but, in actuality, do not. 

Capo 2nd fret

Intro:
G   Bm  Dm  C   C   G   D   D
G   Bm* Dm  C   C   G   D   G   G

G                 Bm
    don't move an inch
Dm           C
listen for a singing
C               G                    D        D
hitting in your bones like they were forts
       G           Bm
if you hear what I hear
Dm             C
    don't just sit there
       C              G
we are only strumming water
        D             C        C*
on this most unlikely court

        G              Bm
you got blown shore to shore
Dm            C
    not quite sailing
C             G              D      D
riding on the trade-winds of age
G          Bm*
    things blow in
Em             C
    don't just cast them
G           D                G       G
say it now, what you want to stay

Interlude:
G   Bm  Em  Em  C   C*

      G           Bm
I was once on a long boat
Dm               C
star mapping the night roots
C              G
lightening the load
        D       D
just in case
   G       Bm      Em     C
but things float in to be taken
   G                 D                 G    G
if you don't know by now what will stay

                 G*(strum once)
so don't move an inch
             Em(strum once)
don't move a single second
          C                 C*              D           D
until the shade behind your thoughts is not confused
                 G*(strum once)
cause I felt your itch
           Em(strum once)
I know the scent as well as any

              C
clotting your garden
             C*
of paints or pollen
              D
brick in your mortar
          D
petals to soak in
       C
on the cracks
           C*
thicker or finer
             D
milk in your water
              D
black in your primer
             C
wood in your brush
              C*
now I am your cloth
             D
whatever you want
             D
the best is upon us
C                  C*
    it's a finicky muse 
          D            D
with only potential

Outro:
   G  Bm*
to choose
   G  Bm*
to choose
G   Bm* G   Bm* 

End on G*