15.Bg4 is plain wrong.
Unless I'm missing something, 15...gxf4 hits your queen so his rook is in zero danger on that move. Your notion of a "queen trap" is non-existent and only occurred because of your opponent's misevaluation of that position. The game might go on 16.Qxf4 Rc8 and you are playing down a piece for a pawn.
Here's a game that I think I did pretty well in. What do you all think?