My hair sounds just like yours. Straight on top and wavy underneath. Have you thought about doing the Curly Girl Method? It helped my waves become more even and prominent. Think about it. Also, try products, use a diffuser, braid waves, bunning, plopping, moisture or protein treatments.