The Afco is nice but it is still just part in a system. You still have lines, fittings, intercooler and pump. Some of this you can improve upon others not so much. All of this is more important while driving on the road as opposed to having the ability to cool down between runs. I would still suggest considering addressing this area especially if you datalog your runs and your IATs are over 135*.
You may be right on the bubble with fueling in the upper rpms. You can always bump up the base pressure to make those 60s act like a larger injector but I would probably be prepared to come up with the coin for a larger set. A good fuel system is a safety net against several dangerous situations.
The pics I attached are what I have done to address cooling. My IATs went from thermal melt down spinning my 2.3L Whipple to just over 18,000 rpms and making 15.5 psi to my new setup still with the same 2.3L Whipple spinning to just under 18,000 rpms making 17.36 psi with IATs to a more manageable zone. I also attached my dyno sheet (run starts at 1,000 rpm) which shows first tunning session to a 93 octane tune to a 104 octane tune just to give you an idea.