I think your dilemma is less about water based vs solvent based, but clear coat, vs single stage.
LOTS of debate on this, and you have to decide what right for you. Do you want a shiny more durable, easier to get done finish? Or are you looking for 10000% period correct authenticity.