Is there any reason they can't allow us to hand in the quest to upgrade a specific relic as any class? If you (for example) handed in a BLM weapon as a SAM, you'll always get an upgraded BLM anyway so it doesn't matter, then the quests after can go back to being BLM only.