Is the fork a matched set with the frame? If so, you are SOL cost-wise. I would recommend the new fork, more spacers and the lower angle on the stem. But if you need 40 mm of spacers and a + stem, that whole frame is too small for you. It is not just a fork problem. BTW, how tall is your top bearing cover? You may be able to improve the appearance of the bike with a taller bearing cover and fewer spacers.

But seriously, I think you need a bigger frame or at least one with a taller stack (taller head tube should do it).