My advice would be to not lock yourself into a "system". Keep it non-indexed if that's what you're already used to on your existing bike. Any downtube or barcon shifter would work in that case, and pretty much any derailleur too. It would be a lot cheaper than going to full-indexing with a Campy system, and a lot less problematic in the long run. I have a 9-speed Campy Veloce system, and I can guarantee that if ever anything breaks and needs to be replaced, that bike is going to see non-indexed downtube shifters for the first time. The only problem is that Campy stuff lasts a long time, so I'm stuck with it :-)
The advantages of an indexed system are way overstated if you're a tourer or solo rider and not a racer or you don't have to shift along with club rides.
Personally though, I would never upgrade a whole bike just to match a wheel. I would either get another wheel or rebuild the wheel with something suitable.