John, I didn't realise that you had a tennant. That alters my advice. Of course you wouldn't ask them to move just so W could move upstairs.
As to getting angry with W, we have all been there. You wouldn't be human if you could suck it up all the time and not say anything. That would be pretty artificial anyway.
Are you sure you want an OR talk tonight? Good luck! rayanne