Maybe the fan you have wired to the temp switch isn't coming on when it needs to come on. I would hook them both up to run all the time, and see if that fixes the problem. You would most likely know it if your waterpump failed (crazy noises and/or leaking).

HOWEVER, looking at your sig pic, I think it would be safe to say that your FMIC is definitely stopping some air from getting to your radiator. Is it a bar and plate? They're notorious for not letting a lot of air pass through. Even if it's tube/fin, it may still be the problem. Without replacing it with something that will let more air in, you may want to think about ways to get hot air out of the engine bay, or more powerful fans, or a bigger radiator, or any combination of those things.

One final note...make sure the timing is properly set on your car. If it's too advanced, it can definitely run hot.