Upgrade router and/or cable modem?

I posted a similar thread in regards to setting up a NAS, but I want to put that aside and see if it is even worth my time/money to upgrade my network equipment.

Here is what I have...

http://www.amazon.com/Netgear-WGR614NA-WGR614-Wireless-G-Router/dp/B00008SCFL

http://www.amazon.com/Zoom-5241-Cab...2089650&sr=1-1&keywords=zoom+1051+cable+modem

I'm considering upgrading to an AirPort Extreme. As far as the cable modem goes, I'm not sure what would be best to upgrade to.

I'm wondering if it is really even worth my time/money to upgrade at all. In all honesty, the set up I have now has been very, very stable. I can't remember the last time I had to unplug/reset the modem or router because of connectivity issues. I'm sort of thinking "if it ain't broke, don't fix it". On the other hand, this is some pretty dated hardware. The router isn't even N capable. As far as the cable modem goes...I really don't know anything about cable modems and I have no idea if it would be beneficial to get a new one. My set up has been stable and useable, but I do feel at times that my connection speeds are a bit weak, I get some lagging while gaming online, download speeds are slow at times, etc. I know speeds mostly hinge on the connection from the ISP. I have a 30MB connection and I typically get about half that whenever I do speed tests...14-15MB down, 3MB up.

Thoughts?

 

I'd like to up it to something faster but 30MB is about as fast as we can get in my area. :/

So having an N capable router as opposed to G, and an updated modem, really wouldn't have much of a noticeable difference considering my connection speed from my ISP?

 

That makes sense. I'll likely just stay with the same modem and upgrade the router since a lot of what I do is wireless. It'd also be nice to have a router with the ability to have a storage device attached to it.