I agree that the OS needs to be updated to keep up. As for the hardware, they are bringing out new devices, such as the Storm, the flip pearl, and so on. They are working their way into the consumer market. The phones you've mentioned were designed for the consumer market, not enterprise market.
That is an area that RIM is trying to make it's way into. I believe they know what they're doing. There are a few new devices on the roadmap for '09 - early '10. We will see how things go.