I actually think this is a great chance to do more with BNB and move him into that World title picture... have RVD put him over and him trot out when Steph announces whatever match is for the World title... "I'm afraid I've got some bad news... as Intercontinental champion I AM the number one contender...check the rules..."
Have it as a thing that Trips is SO used to power that it's entrenched in the rules and cannot be overridden...so he gets inserted into whatever programme/match is for the big belt... he doesn't NEED to win it, but it works for face turn and getting the IC belt over big.
As for the RVD feud, I really don't see this as being much more than to try and get Barrett super over... I don't even see it being a long match. Of the two mid card champs right now Barrett is hottest and of the 3 reported guys they are looking at he is the best equipped to move up as he has already headlined PPV's and beaten big names like Cena, Orton etc... Reigns isn't for right now, Wyatt needs the belt less so give BNB a run, maybe even unify the IC and Worlds for a bit... Three belts would be a very interesting thing for him to hold...