Building the shop around the dwarf... that's good, I like that. I lost my bowyer to the doesn't-recognize-a-later-workshop problem. I did hear that moody dwarves can change the workshop type now.
As for the adamantine... all my adamantine ore was stowed in a special adamantine-only stockpile at some considerable distance from the mason, who had two largish stockpiles of regular stone right in front of and directly below her.
Problem is, the seige was threatening, and I decided I needed to rapidly buld a new stretch of wall. What I *think* happened is that I earmarked the 40 or so nearest stone -- those in the mason's stockpile -- for wall-building. So the Mason went and got the adamantine, instead. I've since built a 100-stone outdoor stockpile.
I'm not clear on what you mean by marking economic stone, but I have oodles of non-economic stone available. My ore is generally stored near my magma smelter. But if you're wondering why I was allowing adamantine to be used, well, it's *not* an economic stone. It's an "other" stone, which means there's nothing to prevent it being used by masons or craftsdwarves.
As an aside, during this same period, my Grand Master craftsdwarf apparently grabbed a chunk and knocked out a masterpiece adamantine piccolo. I doubt that a caravan is ever going to have enough stuff to warrant trading it, unless it's four wagons full of steel anvils.
Doctor Lucky