If you really need the stop over on the return, get this issue addressed now. Waiting will make you VERY unhappy.
You might even want to consider a side ticket if need be. I would not be surprised if a domestic ticket proves very less expensive than changing your existing ticket.