I would definitely recommend staying with Klaus. His guest room is full of pamphlets about Berlin and maps. He was very accomodating and the location was perfect.