Just so I'm understanding you correctly, your current motor makes 350-400hp and you want to upgrade, correct? Also street only, correct?
What exactly are you looking for (HP #, or ET#)....it is easier to make a suggestion if there is a specific goal in mind. All engine parts (the combo) need to work together to make the most of them, which is why I'm asking.