Do you have a "honey do" project that doesn't cost much but he really has put off for a long time? Maybe you could suggest he give you that? Or maybe suggest several so he can surprise you. I would be upfront and tell him that you have already gotten his gift. And yes, I would give it at Christmas. The love that went into creating his gift, the satisfaction of seeing it given, sometimes the gift is really for the giver.