Close enough! I don't play with your #2. When I play, acknowledging the gunshot at all -- seeing the raise in any way -- counts as escalating to gunfighting. But the way you're doing it won't break the game, so that's fine.