i would buy an amp before thinking about changing anythign else.
i notied in my stock 6th gen adding a nice source unit and amp satisfied my hunger for power and actually helped me stock speakers perform better.