Ferrari is still in a much better position than Mclaren, provided the upgrades work. The car is consistent, works in different conditions/tracks and only has a couple of things to improve but nothing too major (slow speed, bit of drag reduction, getting tyres up to temperature).
Remember that Ferrari focused more on consistency this year (rightfully so) and were a bit conservative, but now is the time to unlock performance. The question isn't if Mclaren has surpassed Ferrari, but if Ferrari with the upgrades will be better than RB IMO.
Operationally, strategies and pit stops have been very good, ok at worst which is still much better than previous years. I must say... i am so excited for Imola