Go with the stock heads that you have as you'll not notice any difference in this build w/400 heads. Make a plan, list what you'd like to have, save your bucks and build the top end. When you get ready, we'll have some good suggestions, in the mean time - drive what you've got and enjoy!

Regards,
Glenn