Michael,

Surface to surface would be preferable. Rhino will do some fairly decent edge based solid fillets now, not great but fair.

Thanks!