Thanks for the response, pigman. I'm already doing option 1, but then someone rather unkindly pointed out that the bulky stem ruins the lines of the slender frame tubing, and now I can't unsee it!
I'm tempted by option 2, but finding a stem is still very hard and it's a lot of work to swap...