And after removing the fan a couple times... was about to lock everything down when I noticed the fan/water pump shim laying on the bench...
everything went into the car for hopefully the last time. It all goes together like a puzzle... not fun to put together, but it all fits.