I mean, I don't think diamonds are considered "organic"; same for graphite. But that's where the term "organic" itself starts to break down as a category.
Wikipedia: "Organic chemistry is a subdiscipline within chemistry involving the scientific study of the structure, properties, and reactions of organic compounds and organic materials (i.e. matter in its various forms that contain carbon atoms)."
It doesn't break down at all. Diamonds are organic structures, in the classical definition of that term. (Assuming they weren't treated with insecticides in the mine... /s)
I don't think wikipedia is the best reference here, and I think you're also misinterpreting them; not all carbon-containing substances (including diamond) are considered organic. There is no true classical definition of the term- it's actually a fairly nebulous concept. Ultimately you're just arguing about definitions which is not particularly interesting.