You can swap out, but need the fan bearing cover from gen 2 I think.
I think you are correct. There is part number 1042001328 for the gen 2 fan bearing bracket and 1042001528 for the gen 1 version. I wonder what else changes with hardware, etc. I know the belt length is different as well. I wish I had both version cars in front of me.
In any case, in the interest of getting this beast fired up again, I just ordered the Febi kit and Stabilus damper. Parts should be here Friday which is also when I hope to have the refreshed valve cover back.
With any luck, I will be firing this baby up this weekend!