St Vincent - Huey Newton Chords & Tabs

I've been watching a live video of this, specifically this one:
https://www.youtube.com/watch?v=vCVJcdQXJ14 and trying to get as close to the right tab
as I can. The song has
really only two main riffs in it.

The first one she plays is through the whole first half of the song but she pitch shifts
it up with her Boss PS-5 I think?

e|----------------------|
B|--5---3-5-------------|
G|----4-------4---4-----|
D|----------2---5-------|
A|----------------------|
E|----------------------|

Then before the main riff comes in the synths play something based around this idea:

e|----------3-------------------------|
B|--------3------3--------2-5-----5---|
G|------4------4--------2-------2-----|
D|----5------5--------2-------2-------| x6
A|--5---------------4-----------------|
E|------------------------------------|
[ Tab from: https://www.guitartabs.cc/tabs/s/st_vincent/huey_newton_tab.html ]
Final riff that's repeated for the majority of the second half of the song:
e|------------------------------------------------------------------------------|
B|------------------------------------------------------------------------------|
G|------------------------------------------------------------------------------|
D|------------------------------------------------------------------------------|
A|------------------------------------------------------------------------------|
E|--12-12-10-7-5-3-12-12-10-7-5-3--5p3-5p3-0-5p3-5p3-5p3-0-5p3-5p3-0-5-5-3~-----|

"safe, safe and safest..." etc
e|---------------------|
B|---------------------|
G|---------------------|
D|---------------------|
A|---------------------|
E|--7~~~~--5~~~--------|

At the end she plays ^^^ that riff then a load of open low e strings before finishing on
it again.

Hope that helps!