I've found that leaving your login shell as bash but making fish the default executable for any terminal emulators you use will pretty much prevent any breakage.