A similar problem has already been tackled at English Language & Usage, but it was not identical.
If I wanted to assure my SO, who is worried that we would not get adjacent seats on a plane, that I took care of everything, by asking my assistant do arrange it beforehand, would it be possible to say:
Don't worry, dear, I made sure my assistant arranged everything, so that we will sit together.
Or would I be better off saying:
Don't worry, dear, I made sure my assistant would arrange everything, so that we will sit together
As always, I'd really appreciate it if you could also correct my mistakes, should any appear.