I'd look into those new announcements from Microsoft about the xbox one's backwards compatibility. Depends how much you have invested in the 360 and how important that is to you going forward. There's talk of streaming from the xbox one to a PC. So there's that too I guess. Not sure how great that'd be, but maybe a xbox one is a good choice in your case?
I'm all for PC gaming, don't get me wrong, but I wouldn't mind having the xbox one in the living room if I had more time to actually use either.