The water that is coming up through your floor is most likely a result of hydrostatic pressure. This means that you have an abundance of water under your home. Doing the before mentioned work may not completely solve your problem under your home. I must restate that most contractors only warranty the area in which they waterproof. So, in your case, your walls maybe warrantied to an extent where your floor or slab would not.