yeah you are right BUT IMHO keep taking into account just single target..if a serenity shadow has multi targets, well, it would deal even more damage.
Also I'd take into account the "ideal" fight without holes etc..with experience you pick the right spec etcetc
If you are coding for the optimal dps you should assume the optimal conditions, if not it is not coherent.
IMHO