Eventually he will grow up and adapt, but he needs you to help him with that. Rather than criticism for the sake of criticism grant him constructive criticism, grant him hint, subtle reminders, calm explanations, regularly tell him what is on your mind and encourage him to do the same: Sometimes these seemingly trivial little things can help.
Tension is normal; I've been in some VERY tense situations, and my boyfriend, although 'grown up' isn't exactly on the same wave-length as me, but it's getting better. He used to be clueless, and I helped him grow up by helping him understand me and my views, it opened his eyes to a lot of things, and the complexity and depth of our relationship has certainly sped up his mental development, therefore I know it can work for you too.
On the other hand, if the tension doesn't cease, you need to do what's best for both of you and end it (not to sound all doom and gloom!)
I wish you the best of luck.
Tension is normal; I've been in some VERY tense situations, and my boyfriend, although 'grown up' isn't exactly on the same wave-length as me, but it's getting better. He used to be clueless, and I helped him grow up by helping him understand me and my views, it opened his eyes to a lot of things, and the complexity and depth of our relationship has certainly sped up his mental development, therefore I know it can work for you too.
On the other hand, if the tension doesn't cease, you need to do what's best for both of you and end it (not to sound all doom and gloom!)
I wish you the best of luck.