Ani Difranco - Smiling Underneath chords

(capo 1st fret)
This is how I like to play the Gmaj7 and G6b5 (or whatever it's called) to match 
the live performance on Youtube

Gmaj7
e|--------2-----------|   
B|--------3-----------|
G|--------0-----------|
D|--------0-----------|
A|--------X-----------|
E|--------3-----------|

G6b5
e|--------0-----------|
B|--------2-----------|
G|--------0-----------|
D|--------0-----------|
A|--------X-----------|
E|--------3-----------|


[Intro]
Bm7 D Asus4 (4x)

[Verse 1]
Bm7        D                Asus4
I don't mind waiting in line, no, no
Bm7                 D                     Asus4
I don't mind if the bills pile up and the work is slow
Bm7                  D                        Asus4
I don't mind the gas or the groceries or the grind
        Gmaj7      Asus4   Bm7
Long as I'm with you I'm having a good time
Gmaj7      Asus4   Bm7   D   Asus4
Bm7   D   Asus4 

[ Tab from: http://www.guitaretab.com/a/ani-difranco/355601.html ]
[Verse 2]
Bm7              D                    Asus4
I don't mind the stoner waiter or the poorly cooked food
Bm7              D                           Asus4
I don't mind little miss kitty or her knuckle head dude
Bm7              D                        Asus4  
I don't mind if every last person here is ugly and rude
        Gmaj7    Asus4     Bm7                    Gmaj7    Asus4
Long as I'm with you I got good attitude, long as I'm with you

Bm7  A/C#     D              Gmaj7           G6b5
We  could be stuck in traffic for over a week
       Bm7  A/C#         D              Gmaj7            G6b5
With a car full of quintuplets who are all cutting teeth
     Bm7    A/C#  D             Gmaj7               G6b5
And around my   neck could be a flaming Christmas wreath
           Gmaj7   G6b5   Gmaj7   G6b5                      
And I'd be smiling under, smiling underneath


(Repeat)