This is a good summary, and I agree that NeXT contributed a lot to what Apple is today.

I don't understand your final sentence though... To whom are you referring when you say "They switched from being a H/w S/w company to a S/w company" ?

I thought that both NeXT and Apple continued to produce their own machines and software.