Beat Crusaders – Moon On The Water chords

First Tab I've ever made, I can't believe it took me more than an hour to do  this -.-

Moon on the Water by Beat Crusaders
I suggest you get another guitar player to play along to another part of the song, since 
riff below is played continuously throughout the song.
Listen for strumming pattern

Standard Tuning

Riff used:

E||------------0----------|--------------------5----------|B||-----------------0-----|-------------------------5-----|G||--------------------3--|----------------------------8--|D||-----------------------|-------------------------------|A||-------2---------------|---------------7---------------|E||--0--------------------|----------5--------------------|     Full               moon      Sways


----------------------|--------------------------|------------4--5------|---------------2---4------|----------------------|--------------------------|-------6--------------|--------4-----------------|--4-------------------|---2----------------------|----------------------|--------------------------|  Gently    in the       night   of one fine


----------------------|--0-------------------|----------------------|------------0---------|-------0---------0----|------------0---------|-----------------2----|------------2---------|-----------------2----|-------2--------------|----------------------|-------2--------------|--0-------------------|----------------------|--0-------------------|----------------------|----------------------|----------------------|  day


--0----------------|-------------------|-------------------|-------------------|-------------------|-------------------|


------------0----------|--------------------5----------|-----------------0-----|-------------------------5-----|--------------------3--|----------------------------8--|-----------------------|-------------------------------|-------2---------------|---------------7---------------|--0--------------------|----------5--------------------|  On                  my         way


-----------------------|--------------------------|------------4---5------|---------------2---4------|-----------------------|--------------------------|-------6---------------|--------4-----------------|--4--------------------|---2----------------------|-----------------------|--------------------------|  Looking   for  a        moment       with  my


----------------------|--0-------------------|----------------------|------------0---------|-------0---------0----|------------0---------|-----------------2----|------------2---------|-----------------2----|-------2--------------|----------------------|-------2--------------|--0-------------------|----------------------|--0-------------------|----------------------|----------------------|----------------------|  dear


--0----------------|-------------------|-------------------|-------------------|-------------------|-------------------|


Verse 1: [Use the riff above]

Full moon sways

Gently in the night of one fine day

On my way

Looking for a moment with my dear


(Strumming Interlude) E Asus2 C#m B A Asus2


Verse 2:
E          Asus2Full moon waves
C#m           B              A    Asus2Slowly on the surface of the lake
E         Asus2You were there
C#m           B                  A      Asus2Smiling in my arms for all those years


Chorus:
        C#mWhat a fool?
  A                EI don't know about tomorrow
B               F#mWhat its like to be
   Asus2Ah-
       C#mI was fool
         A             ECouldn't let myself to go
B              F#mEven though I feel
  Asus2The end


Verse 3:
E         Asus2Old love affair
C#m              B               Asus2-A-Asus2Floating like a bird resting her wings
E        Asus2You were there
C#m            B                 Asus2-A-Asus2Smiling in my arms for all those years


Chorus:
        C#mWhat a fool?
  A                EI don't know about tomorrow
B               F#mWhat its like to be
   Asus2Ah-
       C#mI was fool
         A             ECouldn't let myself to go
B              F#mEven though I feel
  Asus2The end


(Interlude) [repeat riff used in Verse 1 x2] Asus2


Chorus:
        C#mWhat a fool?
  A                EI don't know about tomorrow
B               F#mWhat its like to be
   Asus2Ah-
       C#mI was fool
         A             ECouldn't let myself to go
B              F#mEven though I feel
  Asus2The end


Outro: [Use same riff as Verse 1]

Full moon sways

Gentle in the night of one fine day

You were there

Smiling in my arms for all those years

[End with this] let ring~~~~~~~~~~~~||--------0-----------||-------0------------||------2-------------||-----2--------------||----0---------------||--------------------|


What do you think?