It's always possible to avoid having a preposition be the thing that a sentence ends with. If the version with the preposition at the end sounds more natural, I

It's always possible to avoid having a preposition be the thing that a sentence ends with. If the version with the preposition at the end sounds more natural, I agree that's what you should go for.