Heaven Only Knows Remix Bass Tab

This song is fun to play but it gets boring very quickly---here is what i got out of this song:

Main Riff:

G]----8----|
D]---------|
A]--7------|   repeat through out the entire song
E]---------|

Funky Bass Riff (4:08) play fast

G]------------------------------------------------------------2/3------|
D]------------------3h5----------------------2-------------------------|
A]-4h5-0-4-0-4/5-0------0-4--5--0--0-0-4/3-4-4--0-4/5-0-5/4-0------0---|
E]---------------------------------------------------------------------|
                             ^

G]---------------------------------|
D]---------------------------------|
A]--3-0-0---7h8-0--0-0-0h2-0-------|
E]---------------------------------|

(4:23)
G]------------------------|
D]------------------------|
A]-7h8-0--0-0-0h2-0-------|  repeat till song ends
E]------------------------|

that is how i play the funky riff at the end, it maybe wrong but it might sound like 
if my way is wrong:

G]---------------------|
D]---------------------|
A]--0h4--0-0-0-0-0h4---|
E]---------------------|