More of both... in fact, why bother upgrading and upgrading and upgrading the same thing?

It'll be much easier to just buy a new one - especially with so many things wrong with the Laptop. No?