Yo La Tengo - Paddle Forward Chords

All right, I think I pretty much have this down. Most of the song does consist of 
chords, except for one interlude riff played here and there.

Tuning: Standard

Here are all the chords used in the song:

     G   A  Em  F#m  D
|e---3---0---0---2---2---|
|B---3---2---0---2---3---|
|G---0---2---0---2---2---|
|D---0---2---2---4---0---|
|A---2---0---2---4---x---|
|E---3---x---0---2---x---|

Verse 1:

G     A     G     A          Em
SOS,              we've come unmoored
G        A        G        A            Em
Rip ride pulling, pulling away from the shore
Em                F#m     Em            F#m
But we feel safe, inside, not a wave in sight,
Em
Hang on tight, the water's fine

Now the interlude riff is played:

|e--------0---|
|B------------|
|G--2---2-----|
|D------------|
|A------------|
|E------------|

Verse 2:

G        A        G        A    Em
Lock the boat,       we've come unmoored
G           A      G       A    Em
Slipped the cleat, lost at sea, back in the centerboard
Em                F#m      Em              F#m
But we feel safe, for now, as long as time allows,
Em
Hang on tight

Chorus:

G       A                  G       A
        Rushes by too fast,        never seems to last
G       A          D       A      D       A
        Every day, hanging here below the mast

Play around with the interlude riff for the next four bars:

|e---------0---|
|B-------------|
|G---2---2-----|
|D-------------|  x4
|A-------------|
|E-------------|

G   A   G   A   Em
G   A   G   A   Em

G       A      G       A    Em
Ship of fools,   we've come unmoored
G        A        G        A            Em
Rip tide pulling, pulling away from the shore
Em                F#m     Em            F#m
But we feel safe, inside, not a wave in sight,
Em
Hang on tight, there's still time, the water's fine

Play interlude riff for two bars:

|e---------0---|
|B-------------|
|G---2---2-----|
|D-------------|  x2
|A-------------|
|E-------------|

G   A
G   A
G   A
D   A   D   A

and finish on Em

Thank you! Include comments/corrections if you think you find any.