Yeah, there are some "traditional" routes, especially for Skylight and Haystack, Your plan from Upper Works via Calamity Brook sounds solid for a 2-day trip. It’s a bit challenging but not insane. Staying overnight is smart, the views up there are definitely worth soaking in.
Upper Works parking...