The wax will bring up the new paint. If paint is flaking off when you are cutting it back then the surface you have painted on to hasn't been prepared properly. Did you key the whole area which has been painted?
Also, it is near impossible to get paint out of a can to look as good if you are blending it in to old paint work. My advice would be to paint the whole panel.