When are you going?
Skyline is ruined, and Penhydd is shut(re-opening end of this year along with another 30k trail called Blade, some old sections are stil rideable, same with Skyline, its all rideable), Whites has changed but is still superb. The wall has had lots of additional work, route options, extra loops and the bike park.
I would also throw Blaengarw into the mix if you’re doing a weekend in Afan. You can ride to it from Afan if you wanted some natural stuff.
Im local so know whats going on pretty well.