After trying 3 stems I feel finally dialled in with 70mm and 17 degree

OE was 90mm and 7 degrees

Also have ordered Zipp EXPLR handlebar which has 15mm shallower drop.

pretty much feels perfect now and shallower drop should make it even better.