L.A.
You are on the right track.. just fine tune that feeding.
When your baby wakes up in the middle of the night for that feeding, do not turn on the lights, try to feed in the dark (or just with a nightlight)and do not speak to the baby. This will help him want to go back to sleep, because nothing interesting is happening. Right now he eats and is looking at you and listening to you and this is fun for him.
We also noticed with our child that the baby wipes were cold from the air conditioning and would totally wake her up, so we purchased a wipe warmer.. It was a life saver. The wipes were warm and did not send the shock of cold on her bottom..