Contribution based ESA

Hi everyone ! I’m hoping someone can help with my query ? My circumstances changed fr a short while and I was moved from income related esa to contributions based . I haven’t worked fr the past 3 years due to ill health and I receive pip enhanced living and standard mobility . My question is now my circumstances have changed back again I have been left on contributions based ESA which means I don’t qualify fr the cost of living payment . I am currently single and live with my daughter who is a full time student . I currently receive ESA which is £238 a fortnight ! Can anyone tell me should my claim be contributions based or new style esa or UC or a combination of the later 2 ? Also can anyone tell me has pip now changed to ADP all over Scotland and should u still supply ur evidence of ur health condition to the DWP ? I received a booklet in the post a while ago saying it was changing from pip to ADP but haven’t heard anything further and as I understand it the oneness is on the dwp to source any reports and evidence when it’s ADP rather than the claimant having the stress of trying to receive copies of any treatment plans and any updates on long term health conditions . Any advice and /or information would be greatly received . I have found benefits and work forum helped when I appealed my original decision fr PIP from no award on living and standard mobility to enhanced living with the help of benefit and work website and forum it helped me get the right decision Thankyou