Please help me with my baby's hair, it's out of control!?

He's 10 months old. His hair is only out of control because I can't cut it; I promised my mother I wouldn't until she can see him. Anyway, before it started growing it was straight; the longer it gets the wavier/curlier it gets. This makes it sort of unmanageable; I can comb it right after his bath but it waves up as it dries so it's all over the place. It just doesn't look neat. Is there a product I can use that will keep it smooth and neat without that "hair product" feel? Any suggestions are appreciated