You are right, only ü to break the gue and gui forms. The "diptongos" containing a weak-strong vowel combination may be broken into a "hiato" with an accent, such as: vía vs via.