Frustration at night could be wind or gassy. My son does both at night, especially gassy. Since we co-sleep its easy for me to just sit up and bring his little legs up to the sounds of farts lol and rub his tummy. Then, he'll be happy to bf. hopefully you'll be able to stop the bottle. I hated making/warming bottles