Just a couple of thoughts try feeding morning and night. do not free feed and water.
After your baby eats 15 minutes later take him outside.. Maybe this will help and if you want good rest have you tried putting him in bed with you or in a crate right beside the bed?
I am sorry Im not that much help but these are a couple of ideas.. I hope it works out.
Hugs
Vicki