It's going to be a pure Fairy type that evolves into Water/Fairy. We've seen the original pics of Marril. They obviously wanted it to be a Fairy all along, which is why Azurrill was Normal. Fairies, like sound based Pokemon, were just kind of lumped in to the Normal type.
"The most important thing is to never stop questioning." -Albert Einstein. Xbox Live: AlteraLateralus