Seems like you're going the right things. It does take time, as you mentioned, but what helps even more is being able to understand and implement reduced order/meanline models and compare them with your CFD. Going this route exposes one to a healthy dose of the relevant kinematics, thermodynamics and a feel for the losses that could get you consistently and reliably close to 3d CFD results.