Good luck with the next step. I think diet is worth a shot and it might help with night wakings too. Meow had a great thread on healing her son with GAPS diet (he is autistic and she has documented amazing behavioural changes with a strict GAPS diet - not saying your son has anything like autism only that psychological well being is very closely linked to gut health and even small intolerences could be affecting his general health).