Dont really disagree with your water and fire pick, but perhaps consider cu for wind and berith/cherno for dark instead of your original plan