John Mayer - In Repair Acoustic chords

This is my "first tab" but I've been rewriting messed up tabs for myself for a 
while. Version 2 has some funky chords at the end of the chorus (sorry to call out 
the author, but that's just the way it is). Anyway, I love this song, so I figured 
the world could use a 100% accurate version.

Capo 2, or open if the falsetto flip is a tad high for you guitar lovin' baritones out there.

Intro: G, F, C x2            

G       F                    C
To many shadows in my room
G       F                    C
To many hours in this midnight
G       F                    C
To many corners in my mind
G       F                    C
So much to do to set my heart right
[ Tab from: http://www.guitaretab.com/j/john-mayer/259885.html ]
Chorus: 
    
Am                      D               G        F        C        
      Oh, its taking so long I could be wrong, I could be ready.
Am                            D               G         F       C
Oh, but if I take my hearts advice I should assume it's still unsteady.
C    Em C       D        Em C      D
I am... In repair.  I am... In repair.

Verse Two:

G       F                    C
Stood on the corner for a while.
G                  F               C
To wait for the wind to blow down on me.
G          F                C
Hoping it takes away my old ways.
G          F                    C
And brings some brand new look upon me.

Chorus

Solo: Chords from Chorus

Verse Three:

G            F             C
And now Im walking in a park.
G              F                  C
And all of the birds they dance below me.
G          F                   C
Maybe when things turn green again.
G          F                C
It will be good to say you know me.

Chorus