Thanks a lot lowlypion.
I had a little trouble figuring out why your values didn't work, but in the end I found that the values were actually:
d/(d2 + h2)1/2 for the top angle
and
(d/2)/(d2/4 + h2)1/2 for the liquid angle.
All in all though, you greatly helped me. Thank you so much!