Replace XRP with NEO and alternative SUB with Waves.
XRP gains will be quite small and Waves is really cheap now and has such a great usability in the future.
SUB is also awesome (really like the concept), but I think it's not practical in the near future. And also the team is quite unknown, it's almost like they try to hide it.

TRX is a must-buy at this point of time since the FUD-trick worked and the price dropped significantly. The team is awesome and the product will revolutionize the internet as we know it.