Just a few comments, since I'm not an expert in the Colle System (it's a "system," not an "opening," technically)...
I was advised by one person here (http://www.chess.com/forum/view/chess-openings/which-plan-for-blacks-c-pawn-in-colle-system) that Black should not play ...c4 in the Colle System *unless* there is a bishop or knight that can be forced to lose a tempo, which, if true, implies you should have captured that c-pawn before it could chase off your bishop at d3.
Black was unwise to fianchetto on the kingside, since you have the ideal ("biting granite") pawn structure on the queenside to render his fianchettoed bishop somewhat ineffective. Therefore by playing the Colle System you automatically don't need to worry much about kingside fianchettos.
The standard way to attack a fianchettoed king is to castle on the opposite side, then to send down a rook pawn to trade it for the knight pawn, while often having a rook aligned on one of those flank files, especially the rook file. I don't know if that is the strategy in the Colle System, though. I do know the Colle System often relies on the diagonal aiming at h7, with bishop at d3 and queen at c2, so getting your bishop chased off like that hurt your chances for that attack.
Yes, you should have just played Bxg7 and avoided getting your protective kingside pawn structure destroyed.
I don't see any way to trap the queen in this position around move 18. I believe you'd need a knight or more mobility for your bishops to get into that cramped corner. Your best bet would be to play Kh1, Rg1, then try to get a rook up to g4, then h4, but that would take several moves while Black would be dissolving the kingside with those pawn advances you saw.
Thanks to Tom for a fun and good game!
Dan