I suppose they have to make considerations for well paid actors. Rob isn't supposed to appear at all until halfway through that very pivotal moment in Storm. That dialog between him and Jaime was a penis comparison, IMO. The "training" scene in the whorehouse was just HBO trying to outdo Showtime, I suppose.
My wife read somewhere that Clash and Storm were going to be combined this season as well, so maybe you're right.
My only other gripe; Melisandra is not as hot as she is supposed to be. They cast a rather plain looking brunette with a bad dye-job, IMO.