I would personally leave it as is without the ranged combat since with deathscythe even if you add beam pistols it wont add much range to attacks.  I also dont see adding beam pistols or a rifle working considering the wings of deathscythe or in your case the wing from the EW version.