The fact that both of these instructions are in the Bible is all the proof we need to know that both are simultaneously possible (Paul did not have a change of thought). In the first case, a man is to love his wife as Christ loved the church, that is, he is to love her sacrificially. This does not mean he must do everything she says or take responsibility for her happiness (we are each responsible for our own happiness). In the second case, a man is not to allow the demands of his wife to prevent him from serving God with all of his heart and soul.
To sum it up: men are to love, nourish, and cherish their wives, but they are not to let their wives control them. The desires of a wife come second to the purpose of God. This can obviously create some tension at times, which his why Paul also says that those who marry 'will have trouble in the flesh' (1 Corinthians 7:28). We all need a lot of grace to make our marriages work.