The snag with my previous diagram was that there was a big oval called delivery that S+S didnt address. Ray has just fixed that by describing the Experience Hub at the Microsoft's annual Finacial Analysts event. He also rolled up Software + Services into the Software Platform so we now have:

:

 

 Brilliant!