For the CPU line of things, I do agree that you should wait. Now is not the time for your friend to be wasting money if he could potentially have gotten something way out of the ballpark in performance for the price because for many years now Intel has been ripping their customers off in this regard. Not a single Intel chip is worth the money they're selling at.
For the GPU line of things, if you don't want to know what it feels like to buy a product only to regret it because the competitor has some nice features that are handy to you, then I suggest you buy the 1060 and forget AMD. When your friend is tired of FRAPS or DXTory messing up his framerate to record, or a slow CPU to convert video or do any 3D rendering work, believe you me you will regret buying the 480. Even if he doesn't use these now, it's better to have everything and not use versus not having everything when you need it, better value for the dollar. It's not like the 1060 has a price premium over the 480 and they're both the same more or less in gaming performance.
And yes the 6600 is enough for either 480 and 1060 but again, wait to see how Ryzen turns out cuz he could potentially get more for the money