I had a very similar flooring issue to what you have had and then only way we got it sorted was to remove and replace I'm afraid to inform you!