It may sound horrible, but we had a similar issue with our youngest waking up throughout the night. We stopped going into him, first night was horrible but it didnt take him long to realise we wasnt coming in and now sleeps all night.
Worth a try, but you need to be strong willed with it and stick to your guns.