Your problem is easily avoided by using coin control. That way, you can choose which coins to spend, how to combine them, and you will not be caught by surprise that you can't spend the change, because you will know exactly how much change there will be in each transaction, and where will it go.
Coin control is a feature, which currently only the original Bitcoin Core wallet has (as far as I know).