I’m glad it worked for you!
As for your two questions, the first one is more complex than I initially thought. It would require adjusting many classes and HTML containers, as otherwise, the code from the previous solution would cease to function properly. I’m sorry I can’t assist you with that matter.
However, for the issue you mentioned about blocking horizontal scrolling on the x-axis to prevent that white space, there is a simple solution. Add the following code to your theme.css file:
.product__details.product__primary-right {
overflow-x: hidden !important;
}