Just an idea but you could also look at making it so when you dismantled a piece of gear with an ornament you get the invested ornaments back. For example I'd love to use my flawless ornaments for some of my trials gear but am afraid that of I get a better roll I'll be stuck without ornaments I've already invested into another piece of gear.