I am putting a 16" Zirgo electric fan in a stock shroud so it will take advantage of the shroud and hide the fan (even though it is chrome
)
Your fan should be more than enough with a shroud so it would simply be a budget or personal choice. For me, I plan on a future remote start so I can cool the cab before getting in (Phoenix, AZ - nuf said).
What you have looks good, I would be hard pressed to change it. Good luck!
Edit: One other thing to consider is the electric fan relieves the stress on the water pump. Not a huge deal on an inexpensive stocker, but polished aluminum ones get spendy fast.