I went through this with my now 4-yr-old when he was close to 2. We bought a crib tent that you attach over the crib, and it has a zipper to close up when you're putting them down. Eventually, of course, he figured out how to unzip (from the inside - zipper backwards!) the crib tent, so then we had to deal with that, but it still really helped us!
I still regret moving my son to a big bed at 2 1/2 yrs, because we then went through about 6 months of him getting out of bed at naps and bed time (up to 90 times in 1 night - I counted!!!) So... I personally will not move my dd from the crib til absolutely necessary! I don't think the big bed solves problems, it just introduces new ones. I actually think it's better to move to a big bed when the child is older and better understands consequences (i.e. you stay in bed, you get a treat in the morning.)
With Khyan, you've had so many challenges, you probably want to minimize distractions and changes! Good luck.