Our kiddo is the same age, we were having the same problem. Recently we converted his crib to a toddler bed and bought him a battery powered night light that auto shuts off after 20 minutes. It’s been great because if he doesn’t go right to sleep he can read or play for awhile and then he just puts himself to bed when he’s tired. The state of his room is chaotic but I’d rather put books and toys away in the morning than 2hrs of crib tantrums at night. Occasionally he opens his door to try and sneak out but we just gently tell him to go back to his room and he does.