3rd option: new front fork with longer tube?

I haven't tried a stem riser, at least not yet. I think there's a project in the hopper that will call for one. But it seems like that's the solution to your problem. If you wanted to mess around with different angles, that's what I used my adjustable stem for. Once I figured out where I wanted the bars to be, I got a non-adjustable stem. I was also having a problem where I couldn't eliminate the wobble from my adjustable stem. I don't know if that's common or not, but I figure an adjustable stem just gives you one extra potential fail point that serves no function if you're not adjusting it. If folks have had luck with the stem riser, then that is how I'd go.