I had checked out your write up over in NAXJA during my research for mine. Awesome job, I love how it came out!
I ruled out using a stock fan after I couldn't find any friends with some kicking around and junkyards jacked up the price to $75 or more for one (compared to the $30 or so I paid just a couple years ago for one). For $115 I purchased a brand new aftermarket one.
I also found that a stock one wouldn't even fit between the engine and radiator in mine, but that was a non-issue since I ended up moving the radiator forward to fit the aftermarket one I picked up as well.
I plan on keeping an eye out for good stock fans for spares and possibly to redo mine more similar to yours, and for future rigs/projects. I like how it keeps it looking almost factory. Plus it doesn't hang down nearly as much as my 16" does, which impedes on the area I wanted to use for a hidden winch.