You also might takea look on Music Direct and plug in "integrated" into the search box (as I just did) and see if anything comes up in your price range that piques your interest. The beauty of MD is that they have a 60 day audition period, but I am pretty sure you would have to pay for return shipping.
As I typed previously, I don't have any experience with the recent integrated gear, and I am pretty much a tube guy (and I do not see new tube stuff in the price range you listed) but here on MD is a "open box" Icon Audio integrated for about 2k. I don't know anything about Icon, nor do I know anything about the B&W 630s, so 30 wpc might be a problem. But tube wpc isn't quite the same as SS wpc, so I'd be kind of curious how that might work out (if your B&Ws aren't real hungry for wpc).