Phone number part of billing and hide shipping methods by category

Hi there, thanks for this fantastic plugin! – I have a couple of questions.

1. I used the info here: https://www.checkoutwc.com/documentation/how-to-move-billing-address-above-payment-gateways/ so that the payment options are just above the complete order button. But the problem now is that the phone number (which we absolutely require) doesn’t sit within the billing section and sits below it with a noticeable gap between. Is there any way to make the phone number part of the billing details?
   We use ThemeHigh’s Custom Checkout Fields (in case that matters).
2. We also use Woo Conditional Shipping and Payments as we have items that can only be picked up and cannot be shipped (due to their size). They have their own shipping class assigned which Conditional Shipping prevents Flat Rate shipping from being applied. They also all sit in their own category. In the normal theme (we use GeneratePress but same applies with using Storefront), shipping is correctly not shown when one of these products are in the cart. However with this plugin, shipping is still shown as a Delivery Method option. It’s just that when Ship is selected, it comes up with “No shipping methods available”. Is there any way to completely hide the Ship delivery method when either those product categories are in the cart; products with the no-ship shipping class are in the cart; or for the plugin to just respect the Woo Conditional Shipping and Payments plugin settings?

Thanks again! ??