upper intake is ok, but you can do the whole intake (upper and lower) for best results, but obviously more money. Both would do just fine.
My vote is also for colder air, your engine can't injest enough air at this power level to make that much of a difference