So I finally went to get my new phone. I had the same gentleman helping me as in January. He is very patient and he found me a good deal on the Samsung S7. Having had two good experiences at the University Ave store, I don't think I would go anywhere else.
Thanks!