For one day definitely Hamburg, should be enough to see the important things. Berlin is so much bigger and I would wait for the next opportunity to spend about 2 or 3 days there.