No dilemma whatsoever, since dogma is immutable, VII was pastoral (not infallible) and popes are only infallible under specific conditions.
Ergo...
Isn't your Catechism something "faithful" Catholics must obey and receive? We often hear the accusations against non-Catholic Christians of engaging in YOPIOS (your own personal interpretation of Scripture). How is this NOT what Catholics also seem to do with their ecumenical, conciliar "Dogmatic Constitutions" that resulted from these exercises?
How is rationalizing that a Pope is only infallible under certain conditions excuse the assertions from Catholics that he is STILL supposed to be the leader of all Christendom, the "rightful" successor to St. Peter and, in order to gain salvation, we all must be subject to him? Would you have submitted yourself to a Pope like Alexander VI (Rodrigo Borgia)? And, if not, would you not have been found in schism?