You just need better "stroker" cam.
I run 24's on my 357ci and make 350rwhp,
yes runs a little lean at 6,000+rpm, but how long and often you holding 6,000rpms?
30's would be better, but I wouldn't sweat it that much.
and yes, your computer knows air temp going into engine from the Air Intake...