I had this happen as well and you are correct. Change both seals, prop shaft seal and the upper shaft seal and you should be ok. I ran the eng a few hours and changed the gear case oil again and it was fine. This is the reason I change my lower unit oil every 50 hours it's better to find the problem before it becomes a problem.