I don't think I've seen the type 2 you've described.
I bought a set of the type 1 off ebay, and tried to use them on an XTR M965 wheel but they didn't work. The rotor sat too far outboard of the wheel, and it was impossible to get the caliper to line up.
I'm pretty sure the issue was the odd...