FadingPromise, I think I may find myself in your situation - doing surgery before medicine. I was recommended the same sources you're using NMS & Pestana, but from people who had done IM before Surgery. I am very interested to how this worked out for you and what (if any) book you would recommend for a preview of IM for the shelf.
Good luck to you!!