CPUs are not going to get much faster. Instead we will get multi-core CPUs.
Drive technology advances in spurts. There is stuff in the wings that will get us ten times the current capacity. It will arrive when it is cheap and relaible.
Cough cough cough, mumble mumble, cough cough.