fuel caps

Hi everyone, Again more issues with my cheap z3. At least the weather is nice to fix them. And I hope I actually can fix them. So first one and biggest one. I found petrol outside the fuel tank locking cap.It looks like there's also a hole in it? I don't know what a good one looks like but why...

In an effort to keep my 2001, 2.2i Auto as original as possible I am looking for confirmation of the correct Oem fuel cap which would have been specified. I believe I have narrowed it down between the following two choices, uncertain if they represent the period of manufacture or for instance...