One problem I ran into with streamlining and using a combo inflator. Once going thru TSA they broke my second by popping the purge button off my 2nd and not putting it back in the bag.
If you go that route make sure you have an inflator hose in your save-a-dive kit. Same if you go with a hoseless SPG, have a small SPG on a hose just in case.