Huntsman have hight advantage for even more damage and probably the strongest Source skill in Game as I heard. Otherwise I guess you are not wrong, even more because warrior can easily round up whole groups while scoundrel is single-target-attacker.
With same crit chance, meteor shower probably does more damage, also i've seen someone using grasp of the dead with blood surface doing hundreds thousands of damage on crit, not sure if bug....