Also, try talking to the dwarven king, then return to Grisha. Make sure you go through all the speech options. IIRC the option to say you have the armour and gem should just come up if you previously talked about his current work not challenging his skills, etc but maybe going through that again will help.
