You may want to consider a stem extender, since you said yours has been cut. But first, try the stem with the steeper angle.

I believe it was Grant from Rivendell Bicycle Works, who recommends that the handlebar height be at, or just above the level of the saddle. Regardless of if it was Grant or the late, great Sheldon Brown who made that recommendation, try it. I had been more comfortable riding similar to you (on the upper bars, and behind the hoods) until I raised my handlebar by using a stem similar to the one previously linked to. Now, I'm riding on the hoods themselves, and using the drops more, than I did when using the stock stem, and with the height below the saddle, like before.