This is exactly right.  Youll have to listen to the song to see how many times 
you acutally play each riff.

Riff 1
E|-------------------------------
B|-0-1-3-0-1---0-------------
G|-------------2---0-2---------
D|-------------------------------
A|-------------------------------
E|-------------------------------

Riff 2
E|-------------------------------
B|--------------0----0----------
G|------0-0-2----0---2--------
D|---0--------------------------
A|-------------------------------
E|-------------------------------

Again, Im not sure how long you play each riff but thats how they go.

If you want to try to correct it go ahead.