You could try repeating the bed-in procedure.
A few months ago I was reading an article by Georg Kacher (a relatively well-known European motor journalist) who had a similar complaint with his Audi. Someone suggested to him he try a series of threshold braking manouvers from 60 MPH. He was skeptical, but reported great results.
If you think you're going to have to replace your brakes anyway, it can't hurt to try.