Give Tony a call at F.I. and get yourself setup with a great product, or just to get his advice on what route to go, even if it isn't F.I.
1600 is way too much for not even a full CBE. But your money of course...
If you're looking at intakes, depending on how much labor you want to go through, injens may not be the best option.