H7. I want to say you'll find it in your owner's manual, and also superbrightLEDs.com is good about listing it. I wouldn't buy their LED units though,. for the reasons you've posted.
Just made the same discovery as Kermit, its got me wondering if an H4 LED bulb will fit fine if we just bypass the adaptor?
I installed my new LED H7's into my 3rd gen Z, but the High Beam switch doesn't activate anything. I swapped connectors to make sure it wasnt a dud bulb and sure enough it was fine. Neither side wanted to be the High beam...cant figure out why. Either way the running light works fine and looks great!