Tightening straight spokes
A Twist Resist will let you hold the spoke and resist the twisting. They're designed for holing spokes to prevent windup and spinning on straight pulls.

The internet says you can use a cable holder in a pinch, or even some smooth jawed pliers.

I'd be tempted to try thread lock on the hub end as a quick and dirty solution.