Thank you for the recommendation Deem, Sounds like I owe Zeus an apology and need to reconsider my geometry preferences. That tantan FM199 you're happy with has a 69.5 degree head angle (when using a 496.3mm fork).
Doing some very basic maths, with the rule of thumb approach - 10mm A2C change = 0.5 Deg head angle difference I get around a 1 degree reduction from published with a 120mm suspension fork (Manitou R7) and approx 1.75deg increase in head angle when using an SP Cycle 471mm rigid fork. Either the Carbonada Zeus suggested or Deem's TanTan (Actually a little slacker than published due to the reference fork length) give a head angle around 68 degrees with an R7 and 70.8 with a rigid option. This seems a pretty reasonable switch between modes.
For reference, the SP Cycles M06 starts with a 67.9 HA which drops to 67 even with an R7, but only steepens to 69.7 with the rigid fork installed. This seems great for a hardtail, but maybe not quite steep enought for gravel racing?
48 tooth ring is too big for me, we've got hills and I'm no UCI WC level rider, aka, I'm not that strong. I think I'll start with a 38 and go up (or down) from there.
p.s. does anyone know how to insert a libreoffice spreadsheet table into a forum post?