I've never found anything that I thought fit better than the old 3rd ed. rules, but as far as tourny legal lists go, those are both decent ways to go.
Best idea is to make a few sample lists, and playtest them. Find what will suit your playing style the best.