To allow extra reserve in battery probably is always good idea, especially flying in a windy day.

In pattern or imac competitions, I noticed very few instances of planes being requested to be in the holding pattern in the air. The exception is to allow emergency landing (e.g. dead stick).

Options I see possible to improve your situation is

1. use of a lighter battery pack
2. reduce plane's weight

If you can fly slow, it probably is OK to fly it tight Otherwise, you may not have enough time to set things up. You may just try it and see.