If it helps you any to do this, think of で as "by means of" and that it determines how or with what you did something, not the location. I think に is considered the location particle because it tells you where something happened.
Other than that, your sentences and conjugations are fine ^-^