I have been heat treating, driving, and testing 2017 "D" rivets and 2117 "AD" rivets and have been getting shear strengths about 15% less than I am getting out of a 2117 "AD" rivet without heat treating it.
I would have expected the heat treated 2017 to be a bit stronger and a the heat treated...