I didn't get the impression that Neal was in a hotel--I think June was saying that she didn't want him to end up there. I suspect that Neal was in prison for that two months while Peter kept working and working to get their old deal back.

I agree that Peter and Diana are probably working together on the music box. No evil Diana!