i'm in vancouver. As for the hand, i tend not to like reraising qq pf cause its a bit transparent. However he is a shortstacka nd you should generally be willing to play for all his money preflop so its ok. However i still like to cold call here and get all my money in on a decent flop, but your way does work too.