Michael, I took your suggestion to clean up the spline for the revolve of the bottle and that helps a lot. I still can't seem to get a fillet on the edge of the boolean subtraction (for the bottle's ribbing). Is it not possible now even after cleaning up the revolve surface? here's the file I have so far.
there are some hidden objects you can reveal for history.