Geoffrey Bawa, Colombo, Sri Lanka, 1958-1968