Re: looking for a new Marshall
From your age and current amp I'm guessing that you haven't been playing all that long. If that's the case, you'd be better off with the JCM2000 and its increased gain. My brother has a JMP2203 and it's a great amp, but it has some issues that do not lend to it being a good first tube amp. First of all it's demolition loud. To sound its best it needs to be turned up LOUD. Ear plugs aren't recommended, they're essentially required unless you want to go deaf quickly. Second, it is very unforgiving. Due to it being pretty clean for a MV amp, any mistakes will be very evident to any one listening. This will make you a better player over time, but may make it difficult to get used to. Lastly for playing punk a stock 2203 doesn't have all that much gain. Your present amp with the gain on half or slightly less is about what you can expect. A friend of mine used a 2203 in a punk band and sounded great, but he was using an Invader and playing loud as all hell.
I've been playing Marshalls for just under a decade now and I can't really see myself playing anything else. Whatever you choose I'm sure it'll put a smile on your face.