Finished "The Ultra Secret".
Curently reading "Codebreakers: The Inside Story of Bletchley Park"
It has stories by various people who were involved with decoding German and Japanese messages(not just Enigma, but some of the lesser codes as well-pretty unsafe to put an enigma machine on a harbor tug but even messages to the little boats had to be coded as well) at Bletchley and out in the field. A lot of personal rememberances. My eyes glassed over a couple of times when a couple of the people got a little too technical but overall a pretty good read.
Neither book goes into too much detail about the naval enigma though.
One thing I've gotten out of both books was how much a factor in breaking the codes influenced the outcome of the war and how so many strategic decisions were made based on the information the Allies were getting from Ultra.