Yes, Fg square . this will mean going back to FG type wheel (Glued).... If the sun continues to bake the ground hard ,get a set of cubics , very similar to what your running ( may have to re-adjust your gear ratios) A set of KCR step studs for when it's rained & the ground is softer.
Stripped my engine back earlier . get that sorted this evening.
EDIT : The Bull dogs are excellent , was using them few weeks ago.