Thanks for the replies.
Any idea if the Shimano GRX chainring with 46.9mm chain line will be worth waiting for to see if its a better fit?
The White Industries G30 has a chainline of 45mm, so it seems to suggest that the GRX will be a bit wider.
(Sorry, totally no knowledge on MTB stuff).