Getting back into regular workouts... am I on the right track?

sounds like you're on the right track here. Maybe you want to do a bit of low or no impact aerobics cles at your gym. You might want to drop the calories to 1200 and see how you feel while maintaining your workout schedule. Remember though it's not a race and there's no reason aggravate the injuries and have to lay off again for weeks. Try some high rep weight lifting as well. The trainers at your gym can es you better than i can and get that metabolism fired up...good luck you're on your way...