Heh, heh, great news, Bill, and congratulations on your 'CaNoctilux'! (I notice that you haven't succumbed to an M8. Yet.

)
It looks like you found a very nice copy and it looks much happier on your M7 than it did on your IID. I have to admit that the infinity lock drives me even barmier than I already am and if I could disengage it without damaging the lens I would. (Thinks to self: a gentle sledgehammer blow perhaps ... )
Unfortunately the original vented hood is ridiculously expensive - if you can find one - but there are cheap workable hoods available here if yours came without one:
New! Metal 55mm Standard Screw-in Lens Hood on eBay, also Lens Hood, Lens Accessories, Lenses Filters, Cameras Photo (end time 12-Mar-08 15:45:17 GMT)
I found the vendor to be very quick and reliable and, if I recall, Guy said he has used him in the past too.
Really keen to see some shots from Seville. (
With your new M8 if you've succumbed by then.

)
Pete.