There's a whole slew of new Castle sets coming this summer (or sooner), including an actual castle. They seem to be a throwback to the old sets, so they'll probably scratch your itch pretty well. If you haven't already seen the pictures, look around online, as there were leaked scans from a catalog a few weeks back.