I'd thought about that solution for the crafting, but was still pondering whether I wanted to impose that rule after the fact - I didn't know if you'd built your character with the idea of making a bunch of stuff.
However, if you're amenable to it I'll say that crafting costs the same as buying - that neatly gets around the problem of PCs gathering up twice as much magical gear as would normally be allowed.
The checks will ensure that you can't just automatically make items you're unable to find in the shops.