By not coming out the upper hole you mean the overflow hole next to the shift mechanism? That's the correct place to check.
If you're getting oil out your water intake, the water passage between the lower and upper half of the drive is corroded/failed. You'll need to separate the drive to...