Rob, I just got a 85/1.4 (Germany) as well! Although mine has seen some action, the glass is still clean. It comes with a 67-86 (or is it 82 or 87... can someone please correct me...) step up ring, and the metal hood to fit. Funningly enough, this is also the setup for the 50/1.4 that I got, except it was a 55-8x step up ring.
In my understanding, the hood should be ideally matched the focal length and film format. Typically, this produces a flower type hood. However, in practice, I believe that any shading that will keep direct sunlight off the front lens surface when the sun is not in the picture, will perform sufficiently. Hence, the notion of a hand or hat to shade. The only caveat is the hood should not be too large as to vignette the lens, especially prominent in the corners. However, before reaching a vignette conclusion, ensure that the corners of the lens are not normally vignetted anyway due to the design. My 50/1.4 shows slight darkening at the corners.
Given that, I think the large 8x metal lens hood is good. It is much larger than the lens, and being made of metal will protect your lens much better than a collaspsible or smaller hood. Best of luck and hope you enjoy your new lens!