When you say you are "dialled in", hang on there. You are not comfortable on the bike, you are getting elbow ache from over extension. You may be riding the bike, but your current position does not seem to be putting your points of contact where you want them. Youe are not "dialled in".
You can plug a few dimensions into the various fit systems and see what comes out, but ultimately, bar position is a personal choice. It is worth experimenting with various sizes to place the bars where you need them. Front-loading stems make this a lot less hassle than it used to be.
Dont jig around with your saddle to fit the bar position. Fit starts at the feet, then set the saddle, then set the bars.
Have a read of the advice at Peter White Cycles.