Are Apple moving away from making good computers in favour of iPods and iPhones?

I have two Macs in the house, a G4 iMac and a new Macbook. The iMac has been used almost every day since I bought it, runs Panther with all the updates, and has tons of third party software, applications etc, and has never gone wrong. It is quiet, cool and is as reliable as the day it was new. My Macbook on the other hand, 11 months old, has had to go in for repairs to the keyboard, mousepad, and now a new logic board to remedy the Sudden Random Shutdown fault which many seem to have suffered from. The plastic on the top is coming loose and it gets so hot that it feels like it will melt the plastic. To be honest I am pretty disappointed with it, especially as one of the reasons for using Mac was the, up until now, superior hardware. I have read that the Macbook Pro's have also been less than reliable and there seem to be some quality control issues. I feel that Apple (now "Inc" and no longer "Computers"!) have gone off the trail a bit and are now putting too much effort into being the market leaders in small consumer products like iPods and iPhones, and have forgotten what they should be doing which is making first class computers and software. I am not confident that my Macbook will last even to the end of the 3 year warranty and I am now reluctant to consider buying another Apple computer until they improve on the current build quality of the new models. In fact, I was looking at my friends Sony Viao and it was notable how much more solidly built this was than my Apple laptop.
If it all goes horribly wrong for them when the iPhone is released and they don't sell zillions of the things, and people get fed up with the horrible sound of mp3 music and stop buying iPods, then they do not need to lose their loyal Mac computer buyers ..!
Any other Mac users feel the same?