AM4 Motherboards - Phase 2 Opinions?

So i was just watching a video from a month ago where JJ from Asus is talking about the AM4 platform motherboards.

https://www.youtube.com/watch?v=t2vd-fVkcF0

He explains in the video that Asus plans to flesh out the lineup at a later date. This makes sense when you look at what's available for Intel.

The reason why i bring this up is because i'm planning on building a Ryzen 1700 build and have everything except the motherboard.

Do you think i should just take the plunge and get the Asus Crosshair Hero VI or wait to see what comes out after Computex at the end of May?

The Crosshair isn't terrible, but who really needs that many USB ports? And the RAM speeds and Ryzen are still an issue. I suppose i'd be looking for something like the Z270 boards, the Asus Strix Z270E Gaming or the Asus Maximus IX Formula.

I cant help but think a better board is round the corner built with 'lessons learnt' in mind.