Whilst I agree with that first flow, and your general point about going over to bi-modal at least, flows 2 & 3 (and many other) may be more of an issue depending on the range that they can achieve on diesel (which I would think is not particularly long), and indeed the power on diesel, whilst an improvement over the 88s, still strikes me as too little for the sleeper
Bimodal locomotives at the moment strike me as more of an 'Electric loco that can do limited diesel running' than a 'Diesel loco that can use OLE' which still rather limits their usefulness, although I'm willing to be proven wrong. The obvious thing to do is crack on with electrification of freight flows to enable use of pure electric locos (with batteries for shunting in unelectrified terminals)