I have never been able to find a suitable electric fan from an
auto parts store, I think the OEM stuff available at the wrecking
yards are better at cooling, but on a second note, the Samurai
radiator is a bit small for a 2.0 + engine, so you might need to
get something with more cooling rows to help cool it down, this
would be more true if it were over heating at speed or load, but
stop and go should not be as much of a problem, look at the temp
switch that activates the fan, is it working? where is the heat signal
taken from? the block or the hose?