It sounds like you are doing an excellent job of trying to comply with your physician's recommendations when it comes to important changes in your diet. This can be very difficult, but following your physician's recommendations can definitely make a difference in your overall health so it is important that you continue to do your best to make these changes. In general, milk of any kind and broth-based soups are counted towards a patient's total fluid intake for the day. Soup that is not a broth-base (a chili or chowder) is often not counted. Yogurt would not count towards a fluid intake.
If you have any questions about how to make these changes in your diet, you should feel free to discuss this further with your physician. He or she may also be able to refer you to a nutritionist
which might be a helpful step for you to continue to make adjustments in your diet. If you have a history of osteoporosis, it will be important to make sure you get adequate calcium and vitamin D in your diet, and since milk and dairy products can be an important source of these nutrients, you want to make sure that you continue to adjust your diet in the right way by discussing it with a medical professional.