I was wonder if anyone could point me in the direction of well-made castle maps, preferably on grid.
You can find a lot in here, historic and fantasy both.
This is the best site I’ve found for historic castle maps and images. These campaign maps have also proven an excellent inspiration at the dungeon scale.