I think you are. Tony and Johnny Sack's relationship was in a pretty good place before this episode especially after Tony doing the Rusty hit for him. In "Sopranos Home Movies" Tony tells Carmela he "destroyed his relationship with Johnny Sac" by getting her that house.