Garbage - Battle In Me Chords & Tabs

I used this video http://www.youtube.com/watch?v=5YIwCBI61po to tab this song. Album 
version is a little bit different though. I think it's 99% correct. Send me a message if 
you have any comments.

riff 1 (intro)
G|-------------------------|
D|-------------------------|
A|-------5-7---------------|
E|-0-7--------0-7-5-7------|x8

riff 2 ("look at you, an accident of drinking")
G|------------------------|
D|------------------------|
A|----------5-------------|
E|-0-0--7----7-7--0-0-----|x4

riff 1 x8 ("what a joke but do you hear me laughing?")
[ Tab from: https://www.guitartabs.cc/tabs/g/garbage/battle_in_me_btab.html ]
riff 3 ("now me and you let's cut this party")
G|-------------------------------------------|--------------------------------------------------|
D|-------------------------------------------|--------------------------------------------------|
A|-3333333-0-----------3333333-0-3-5555555-3-|-3333333-0------------------3333333-0-3-11111111--|
E|-----------33333333------------------------|------------------33333333------------------------|

riff 4 ("it's the battle in me")
G|--------------------------------------------|
D|--------------------------------------------|
A|--------------------------------------------|
E|-55555-555--55555-555--55555-555--55555-555-|x2
or
G|--------------------------------------------|
D|--------------------------------------------|
A|--------------------------------------------|
E|-00000-000--22222-223--33333-335--55555-553-|x2

riff 2 x4 ("it's a bloody war of attrition")
riff 1 x8 ("'cause I have all of my wits around me")
riff 3 x2 ("white rabbit plays right when the room starts spinning")
riff 4 x2 ("it's the battle in me")

riff 5 ("let's take a torch")
G|---------------------------------------------------|
D|---------------------------------------------------|
A|---------------333-0-333-0-----7-----76--555-555---|
E|-555-0-55--5-3--------------55---55----------------|

riff 6
G|---------|
D|---------|
A|-3-3-3-3-|
E|---------|

riff 3 (second part)