I am not sure if this helps, but I got fed up with the same problems
I use Shortkeys for a lot of the other parts of my note so I codified my common diagnoses (top 50 or so) and just enter them as codes
(e.g "dxhtn" will result in # HYPERTENSION, BENIGN ESSENTIAL (401.1): )
This works for about 85% of what I do and saves a ton of time
