Personally, if stuff is going on to vinyl, do as little mastering as possible, it's much easier for the cutting engineer to sort stuff out that hasn't been overly compressed..
@Deaf Mosaic: sounds like something very wrong is going on between your distributor and curved, there's no way that production can start until TPs are approved..