Need help on Crowded House - Don't Dream It's Over Solo

Hi guys,

I'm really struggling with the solo on this track. I can't for the life of me figure out what the notes are, either by ear or with tabs (everything out there is wrong). Any videos on the subject are almost always acoustic, or missing the solo, and watching live performances hasn't helped because they don't show the guitar much during the solo, and/or he changes it up drastically.

It's such a cool funky little riff, but I can't figure it out!

Here's what I've kinda worked out so far....

e|---------------------------------------------------------|
B|------------11---9--------------8---8~~~-----------------|
G|---------8--10---8---8----------8---8~~~-----------------|
D|--8h10-------------------8h10----------------------------|
A|---------------------------------------------------------|
E|---------------------------------------------------------|

e|---------------------------------------------------------|
B|------------11---9---------------------------------------|
G|---------8--10---8---8----------10b12r10p8---------------|
D|--8h10-------------------8h10----------------10~~~-------|
A|---------------------------------------------------------|
E|---------------------------------------------------------|

e|---------------------------------------------------------------------------------------------------|
B|------------11---9--------------8---8-----------------------------------------------11----11/13-11-|
G|---------8--10---8---8----------8---8-----8---8--8----8h10----------8h10p8---10/12-----12----------|
D|--8h10-------------------8h10------------11--11----11--------8h9p8---------------------------------|
A|-----------------------------------------11--------------------------------------------------------|
E|---------------------------------------------------------------------------------------------------|