It is ideal to go into surgery with as close to full, proper, safe ROM as possible and the best strength possible. The (p)rehab stuff would be ideal to do leading up to surgery.
You are on the right path with what you listed. Focus on getting full, pain free ROM and and strengthening the rot cuff and scapular stabilizers. If you go into surgery with a high level of strength and ROM, you should have a better recovery from surgery. If they are pain free, it should be save to perform some push ups, pulldowns/pull ups, and other basic exercises.