I am so sorry that you have that problems although you work so hard on your trumpet.
May that suggestion can help you.
I learned to play with milk spout( embouchure 2.0). But when you hold the bell of your trumpet as high as you do without milk spout ( 1.0 embouchure) I made the experience that to much pressure on the upper lip close your embouchure to much.
Please try to experience with the angle of your trumpet. Bell high, bell lower.
It changed at lot in my sound and my made my playing more efficient.
Maybe it helps you?
Best regards and good luck