Fixx - Saved By Zero Chords & Tabs

This is the staccato lead part for "Saved By Zero":

I=Index/M=Middle/R=Ring/P=Pinky

1)----------------------------------|
2)------------3-3--2----------------|
3)-4--2----2----------4--2----------|
4)------4---------------------------|
5)----------------------------------|
6)----------------------------------|
   R  I R  I  M M  I  R  I
[ Tab from: https://www.guitartabs.cc/tabs/f/fixx/saved_by_zero_tab.html ]
And this is an attempt at the solo:
     /\ /\ /\ /\    /\ /\ /\ /\
1)-7--------------7-------------+---7--7-7----------7--7-7---|
2)-7--------------7-------------+---7--7-7----------7--7-7---|
3)-7--------------7-------------+.--7--7-7----7-9---7--7-7---|
4)-9--------------9-------------+.----------9----------------|
5)------------------------------+----------------------------|
6)------------------------------+----------------------------|
  Bm  (Trem Shake for two measures) I  I I  R I R   I  I I

1)----------7--7-7---------7--7-7--X--7--7--X--+-------------|
2)----------7--7-7---------7--7-7--X--7--7--X--+-------------|
3)---7------7--7-7----7-9--7--7-7--X--7--7--X-.+-------------|
4)-9---9-7----------9-------------------------.+-------------|
5)---------------------------------------------+-------------|
6)---------------------------------------------+-------------|
   R I R I  I  I I  R I R  I  I I  I  I  I  I