I know you just bought your '04 but if you are willing to spend an extra $15K to get as much power as an SRT6 you could probably trade your '04 for an SRT6 and I doubt the difference would be more than $10K out of pocket.

There are still some good deals on SRT6s out there. That way you get the whole package, engine with supercharger, upgraded suspension and especially the brakes. Don't forget they will all be covered under warranty as well.