Thanks for the replies.
I went with my heart and my gut and ordered a CZ P-07 in 9mm.
I decided that I didn't want to replace my EDC G27, so the compact Storm end up being on the smaller side for a HD/range gun. The size of the P-07 kinda hits the sweet spot.
Hopefully that decision will be rewarded next week.