Marauder, Energy first build

With all this new "ground breaking" info about Energy Charge's vast versatility over 3rd job transformation,is it safe to say that the GMS Marauder build can be simplyfied as follows?:

+1 Energy Charge
+1 Energy Drain
+11 (12) Energy Charge
+11 Energy Blast
+28 (Max) Energy Charge
+19 (Max) Energy Blast
+20 (Max) Stun Mastery
+19 (Max) Energy Drain
+1 Transform
+21 Shock Wave
+19 (Max) Transform

-or am I just kidding myself.

That's exactly what i was going to do, except i was going to max drain before stun mastery and blast.