Heavens On Fire Cifras

This is my interpretation of the song, I know it's not 100% correct but it does sound like the original song. 
I think the original song is played in a different tuning.
 
Chords in accordance to Capo on the 1st fret. Notice that Em7 is different from Em7*.
 
     G     A    Em7  Gm/D  Em7*  Gm/D
e|---3-----5-----3-----2-----0-----2---|
B|---3-----5-----3-----2-----3-----2---|
G|---4-----6-----0-----2-----0-----2---|
D|---5-----7-----0-----0-----2-----0---|
A|---5-----7-----2-----0-----2-----0---|
E|---3-----5-----0-----0-----0-----0---|
 
 
The riff below is played mostly throughout the song. Just keep playing it over the Verse/Chorus.
 
*Riff 1*
 
    Em7  Gm/D  Em7*  Gm/D
e|--3-----2-----0-----2-----|
B|--3-----2-----3-----2-----|
G|--0-----2-----0-----2-----|
D|--0-----0-----2-----0-----|
A|--2-----0-----2-----0-----|
E|--0-----0-----0-----0-----|
    3x    5x    3x    5x
 
----------------------------------------------------------------------
 
Intro(after the talking):  Play *Riff 1* x2
 
Verse/Chorus: Play *Riff 1* x5
 
"When I look at you, heaven's on fire
I wish I didn't know you better, but it's pointless
One look at you, and heaven's on fire
 
 
Verse/Chorus: Play *Riff 1* x4
 
When I look at you, I reach for a piano wire
Fighting to keep it together, but it's pointless
One look at you and heaven's on fire,
Heaven's on fire
 
Bridge
 
G                                 A
It seems like everyone is on your side
A                                      G
We're outnumbered by those who take no pride
G                                A
In constantly moving against the tide
A                                       G
Charlatans just out of reach and out of time
 
*Riff 1* x2
 
Verse/Chorus: Play *Riff 1* x4
 
I'm a little like you, ugly on the inside
But while I dive into the gritty, you just stand by
When I look at you Heaven's on fire
Heaven's on fire
 
G                                 A
It seems like everyone is on your side
A                                      G
We're outnumbered by those who take no pride
G                                A
In constantly moving against the tide
A                                       G
Charlatans just out of reach and out of time
 
G A
 
A                                      G     G
Charlatans just out of reach and out of time
 
*Riff 1* x6
X