I have new construction walls. I used a paint and primer in one product. The paint is peeling off the walls. The manufacture is saying to scrape the best I can and then use oil based primer. Is this recommended and if so what kind of paint should I use?