Competing micellar and cylindrical phases in semi-dilute diblock copolymer solutions