The staining will continue whenever you apply a water based paint, only an oil based paint will stop it. When you have applied a coat of oil based paint this will act as a barrier, so then you can go back to the original water based paint it should be OK.