C.C.
I would set up a pack-n-play in another room for the 2 year old. My 2 year old's schedule is almost identical to yours, and I think you'd find yourself going crazy if you had to deal with a grumpy toddler every evening. Plus, some quiet time for yourself is important as well. When my other kids stopped napping, we had the rule that they would still have some quiet time on their beds. They would sing and talk and read books, but that gave me the time I needed to recharge. Now that they are in school, during the summer we still have quiet time when they read or draw and I relax too. Good luck!