Shimano or anyone else that makes cartridge BB's will probably work. You put all the info you need in your OP. Just look for another BB maker that has the spec's you wrote.

You might still have an issue with how far down on the tapers the cranks sit, but as this is a very modern bike with the current for today type of square tapers, then you should be good. Just be a little leery if their description starts talking about it fitting old bikes.