I'm an integrated guy, so another vote for integrated.
I don't know your speakers, but I'm wondering if 3k is a large amp investment relative to your current speaker investment (3x?).
If you are pat with the B&Ws for the foreseeable future, I wonder if you couldn't be quite happy with a lower investment in the amp, with more budget for doing things like sorting out the vinyl.