Drop D Step Tuning (low to high: D A D G B E)

This is what I got for the main riff after the 
OOO aaaaa
e----------------------------------------------------------------------
B----------------------------------------------------------------------
G----------------------------------------------------------------------
D----------------------------------------------------------------------
A---6----------2--------1--------1------------------------------------- Repeat 2x
E----6----------2--------1--------1------------------------------------

The second time when they repeat the main guitar part, it's played once at the Patton octave
which I think could be this, although it could be different. It's done this way because my high E string is broken.


Repeat main riff then go to 

e--------------------------
B----------------------17--
G-------15-------15--------
D-----14-------------------
A--------------------------
E--------------------------

Then go to main riff 2x
then done