Thanks!
The knockup was intended, but the clipping was not! Although I kind of like the clipping, so I'm thinking about maybe using it as a mechanic in a different metroidvania game...!
Yeah, it's a little tricky to do, but it is possible to skip the final upgrade.