Heavens On Fire Chords

Capo 6
 
The intro riff thing:
 
e|-----------------|
B|----2------------|
G|--2---4--2-1-4---|
D|-----------------|
A|-----------------|
E|-----------------|
 
Now, there are 2 ways to play these chord progression, which is Bm, A, D, Amaj7.
 
One is the way the actual band plays it, which is like this:
    Bm    A     D   Amaj7
e|--2-----0-----2-----0----|
B|--3-----2-----3-----2----|
G|--4-----2-----2-----1----|
D|--4-----2-----0-----2----|
A|--2-----0-----x-----0----|
E|--x-----x-----x-----x----|
 
It sounds ok, but somehow in the recorded version you hear a rise from the A to D,
so I just switch the A and D to barre chords.
 
    Bm    A     D   Amaj7          Amaj7
e|--2-----x-----x-----0----        --x--|
B|--3-----x-----7-----2----        --x--|
G|--4-----6-----7-----1----   OR   --6--|
D|--4-----7-----7-----2----        --6--|
A|--2-----7-----5-----0----        --7--|
E|--x-----5-----x-----x----        --5--|
 
(The barred version of Amaj7 is just to the right of it)
 
The barred versions of the chords all still sound good if you don't mute the B and high e string.
X