Dispatch - The General Chords & Tabs

Other intro was right at some points, but missing a few things.  This is how I like to play it:

E|------------------------------------------------------
B|------------------------------------------------------
G|------------------------------------------------5-5---
D|---------------3-3--3--3-3h5p3--3---------------5-5-5-
A|--------1--1---1-1--3-------------5-3-------1/3-3-3-5-
E|-1h2--3------3-------------------------6-3----------3-
[ Tab from: https://www.guitartabs.cc/tabs/d/dispatch/the_general_tab_ver_4.html ]
E|--------------------------------------------------------
B|--------------------------------------------------------
G|-----------------8-x-x-x-x------------------------------
D|-----------------8-x-x-x-x-8-8-x-x-3-3--3--3------------
A|-----1h3--3--1/6-6-x-x-x-x-8-8-x-x-3-3--3--3------------
E|-1h3---------------x-x-x-x-6-6-x-x-1-1--1--1------------

Repeat, first riff is slightly different this time:

E|------------------------
B|------------------------
G|------------------------
D|------------------3-3--3
A|-----------1--1---1-1--3
E|-1--1h2h3-------3-------  (the rest is the same as above)