Tab Battles Tonto Versi 2

I've only managed to figure out these parts, but I'm pretty sure they're right. Fun to
anyway.
If anyone knows how to play the intro or some of the other crazy high parts throughout
song you should tab them!
I've done my best with the rhythm, though it's pretty easy to figure it out if you play along.

Main Riff (played nearly throughout):

e|-------------------------------|
B|-------------------------------|
G|-------------------------------|
D|-------------------------------|
A|------0------0------0h3h5p3-0--|
E|--3h5----3h5----3h5------------|

Heavier Part (played from about 2.45):

||This part sounds good with two guitars, one playing like this, and ||
||the other playing the same thing at the 12th fret, I switch between||
|| where I play it depending on my mood :) ||

e|------------------------------|
B|------------------------------|
G|------------------------------|
D|----------0--0----------0--0--| x8
A|--0-0---3-------0-0---3-------|
E|------------------------------|

e|------------------------------|
B|------------------------------|
G|------------------------------|
D|--0-0---3-5--5--0-0---3-5--5--| x4
A|------------------------------|
E|------------------------------|

e|------------------------------|
B|------------------------------|
G|------------------------------|
D|----------0--0----------0--0--| x4
A|--0-0---3-------0-0---3-------|
E|------------------------------|

e|------------------------------|
B|------------------------------|
G|------------------------------|
D|--0-0---3-5--5--0-0---3-5--5--| x6
A|------------------------------|
E|------------------------------|

e|------------------------------|
B|------------------------------|
G|------------------------------|
D|--0-0---3-5--5--3--0----------| x1
A|----------------------3--0----|
E|------------------------------|

e|-----------------------------------------------------|
B|-----------------------------------------------------|
G|------------------------------2--------2---------2---|
D|-5---5---5-----5---5------5--------------------------| x4
A|---3---3----3----3---3-3----3----0--0----0----0----0-|
E|-----------------------------------------------------|

Trill Parts (from about 3.42):

e|-3-----5-----3--5--8--5-|-3-----5-----3-5-8-1013108-5-|
B|------------------------|-----------------------------|
G|------------------------|-----------------------------|
D|------------------------|-----------------------------| x1
A|------------------------|-----------------------------|
E|------------------------|-----------------------------|

e|-3-----5-----3--5--8--5-|-3-----5-----3-5-8-5-3--5----|
B|------------------------|-----------------------------|
G|------------------------|-----------------------------|
D|------------------------|-----------------------------| x1
A|------------------------|-----------------------------|
E|------------------------|-----------------------------|

e|-3-----5-----3--5--8--5-|-3-----5-----3-5-3--3--3-----|
B|------------------------|-----------------------------|
G|------------------------|-----------------------------|
D|------------------------|-----------------------------| x1
A|------------------------|-----------------------------|
E|------------------------|-----------------------------|

e|-3-----5-----3--5--8--5-|-3-----5-----3-5-8-1013108-5-|
B|------------------------|-----------------------------|
G|------------------------|-----------------------------|
D|------------------------|-----------------------------| x1
A|------------------------|-----------------------------|
E|------------------------|-----------------------------|