Who recommended you buy a system with 2GB of RAM in the first place? That was never going to be much chop as a general use system. Fine for very basic and limited use but not if you're wanting to do more than light browsing and e-mail.
I doubt it was either of those Rivets - sounds more like a hardware issue.