I, too, suggest the b) option. What I did was get an adjustable stem such as this. You can use it to try to find the right angle, and (if you're too snobbish to ride a bike with it) buy a fixed stem with that angle.

I ride my bike with tha stem there. It has the advantage of making my bike more easy to ride by my wife, when she feels like. She just adjusts the angle a bit more upwards. Much easier than swapping stems. Besides, I am really not bothered by what people think of my bicycle.

EDIT: Adding a few headset spacers (if you can) is entirely cromulant as well.