Sorry matey :oops: I guess me and Alan (hamfist) haven't helped eh?
I'll probably just echo what Martin has told you as we have very similar ideas on amps, but here goes:
1) A Marshall vintage reissue has the badge if that bothers you. Inside, it's a JTM45 with a few component changes from a 'real' one. It's a circuit board layout, which isn't on it's own a bad thing. Used ones come up on eBay for reasonable money (£400ish). You mentioned "upgrading" one, but in what way? Changing a few components to get the circuit just right is worth doing, but swapping circuit boards and transformers is a waste of money IMO.
2) The Metro kit (or complete amp built by George) strives to be vintage accurate, but as Marshall's spec changed all the time in the early days who's to say what is truly "vintage accurate"? You can pay a lot for named components (Sozo caps, Heyboer transformers etc) when other parts are just as good. Which brings me to....
3) Ceriatone kits offer the best bang for buck out there. Good quality parts, no inflated prices, great tone etc. Martin will assemble it for you, give you a guarantee and tweak it however you want it tweaking. You can choose how you want your head cab covering, get a matching 2x12 if you want, have London Power Scaling fitted etc. All for a price of course, but you get exactly what you want.
The question is, what do you want and what's more important? Cheapest option is a used reissue JTM45. Most expensive and more vintage-y is a pre-built Metropolis amp. Best bang for buck to give you a top sounding amp with excellent support is a Martamp Ceriatone-based custom build.
Only you can decide what suits your needs best.......