At the end decided to keep the Holy Grail, even though the rendering is really neck and neck with the newer version, the bokeh is just that tad softer that the main subject stands out that bit more to render the overall image preferable to my eyes. On short to medium distance probably the F2 is just a bit sharper, especially towards midframe and corners, but to my surprise at infinity the Holy Grail is quite a bit sharper, even wide open. Guess it is possible that the newer version was more optimized for the shorter distances, if I recall correctly I've read a comparison review that was hinting at something like that. I know my F2 is in good order as it was checked for focus accuracy by Canon some months ago.
Anyway, the F1.8 it's really an amazing and unique proposition still today, really a testament of what Canon put into it at the time..