I highly recommend https://www.whitlams-berlin-tours.com/

He can personalize a tour for anything you want to see in Berlin and surrounding areas and for any amount of time.