Make +skill and +dmg affixes on staves and wands more common?

I'm doing a fire mage playthgrough and I went with a witch infernalist. I'm currently in act3 cruel, I check shop every level, I pick up every wand and staff and craft each one to at least 2 affixes. I have not found A SINGLE wand or staff that would give me more than +1 to fire skills and any respectable +%dmg. And I'm about to finish the campaign on cruel. Thank god for demonform which gives good stats, but if I didn't have demon form I would literally do 0 dmg and would not be able to continue the game at all. Damage is so important, especially with act bosses being huge damage sponges right now, that there's just no way to play as a caster if the crucial damage affixes are so rare. I think at this stage of the game getting at least +3 to fire spells and some decent +%dmg should be a common thing to just be able to play the game, but I havent seen a single such item in 6 acts.

By the time i got my +4 wand i was level 90 doing t15s. The game is horrible to play without trade, and if u trade it feels like there is no progression and you just instantly win without doing anything.
Still +1 offhand and +2 amulet at level 91, even tho im picking every single one and 3 to 1 them. Also my +4 wand i finally got was the base i didnt want..