Never touch a running system and this system is pretty damn awesome.
Before Final Fantasy I played SWTOR with my PS3 pad via motioninjoy and my layout was similar to this; a bit better I thought at first, but it turns out that this layout is superior.
I use the functions of R1 and L1 as it is mapped now a lot, but if there is one suggestion I'd have it would be R2+L2 - with motioninjoy I Set my L2 as ctrl and my R2 as shift, so I could go ctrl+1-8 or shift+1-8 or ctrl+shift+1-8.
But other than that there is no need to change it at all.