I Visited the week before the new ride opened, mainly because actually managed to get a last minute slot with the merlin pass.
Outside now is the 4D cinema, Kids playground, History of Cadbury/ Bournville and the have a go bit -
Inside it is all on one floor now.
As you go through to the chocolate demonstration area on the left hand side 2 doors is where the entrance to Cadabra was - This had already shut when we were there although they stated it would be open until the new ride was but maintenance issue had forced it to close. Also a lot of other bits were still shut - the advertising bit the gorilla was still missing and alot of other stuff was in a poor state tbh.
On A plus side the food in the cafe was very nice - It hasn't been merlin'd yet by the look of it and I hope it stays this way.
The new ride is located right at the exit by the gift shop - but doesn't have a proper waiting area for it so the queue just ends up blocking the corridor all the way back to the chocolate tasting area.
And for the important bit we got 4 bars of free chocolate each through the tour - however this does seem to vary every day/ depending on who is giving it out by looking at videos/reviews online.
Elise if you try the day before/2 days before you want to go there are nearly always a 4pm/4:30pm slot available - least popular time with the public it seems so at that late point they release it to annual pass holders.