Long time lurker, first(-ish) time poster

I got my sin up to 20 when factions came out and then stopped playing as I wanted to try something different, I suppose. I was running a shove - falling spider - golden phoenix strike - twisting fangs combo in AB and relishing the general shouts from warriors who thought they could keep up with my damage. Ah, good times.
Having played through nightfall with an MM, I thought I'd come back and try and make another go of the sin and take him through EotN and possibly the latter stages of prohpecies (for old times sake!).
I have since changed my build to include aura of displacement and the new nf skill critical agility, which I think really helps bring some enjoyment back into the class, for me anyway. The ability to jump in and out of battle, slashing as I go is appealing

Now my build is:
A/Mo
Dag Mas:11 (1+2) = 14
Crit: 12 (+2) = 14
Healing: 7 (I think, maybe 8)
Aura of Displacement - Golden Fox Strike - Wild Strike - Twisting Fangs - Death Blossom - Critical Agility - Purge Conditions - Restful Breeze
I am hoping to switch out Purge Conditions of Comtemplation of Purity (but I understand I have to get to the Amnoon Oasis first to purchase it...so looks like I will be playing prophecies for a while!!
I use GFS and WS as they are short recharge. GFS rarely misses (under AoD) and WS is very handy in removing stances which otherwise would drive me up the wall.
I have 2 duals as they obviously accomplish very different purposes. One for crown control, one to soften up more resiliant individual targets.
My main problem at the moment is energy. After using the 10e for AoD I find I am often out of energy by the time i want to use twisting fangs. I have since added 2 radiant insignias to alleviate this isue (take e from 25 to 30 base), but will have to wait till I get home to see if that helps greatly. Perhaps Critical Eye would help?
I have toyed with using Golden Phoenix Strike, but I find the recharge is too long for it to be used as frequently as I would like. I could just drop AoD and get Moebius Strike I suppose, but I enjoy AoD and so would prefer to keep it.
If anyone has any comments or suggested changes, they would be gratefully received. I am going to be mainly pve-ing, but suggestions to help in pvp are also welcome.
Thanks all.