Shower Waterproofing

Good afternoon. We're redoing our master bath shower and I'm hoping to get some pointers as we proceed. I've just finished installing a new oatey drain and preslope, and I'm about to install the liner and pan, but before I do I wanted to get opinions first and ensure code compliance. Two walls will be tiled and the door and side will be frameless glass. The wall will need to be stepped glass as it's formed by the tub box. The old version of the shower had a 2 foot pony wall on top of the box, and we determined we didn't need that anymore with todays frameless glass ability. My concern is this corner. Is there enough height there for the waterproofing to be compliant, or do I need to raise it higher to be flush with the top of the box? We'd prefer it as-is and just do a stepped glass wall. Additionally, is my blocking tall enough to attach my membrane? I only have 4 3/4 inches from preslope to top of blocking, because my preslope needed to be 1.5 tall since its a large shower, and that height was derived from the farthest point from the drain for 1/4 per foot. Should I scab in some more blocking? Any help much appreciated.