You will be fine with expanding foam around perimeter, and then trimming it back. Whether this is more effective than what you have in situ, is possibly debatable. With the ply overboarding you are screwing it down at 150mm centres I'm guessing, so any expansion will be negligible anyway.