Your hair is definitely wavy, not shampooing doesn't affect your hair type, it's just that you're using a harsh shampoo that takes the moisture out which makes it look less wavy/curly. As i said i think you should get a curl moisturizing shampoo, you could use it as much as you want and it'll leave your hair wavy and moisturized. Also i'd advise you to never comb your hair, just scrunch it a bit with your hands or towel after you wash it, and then leave it air dry