I've managed a workaround for now similar to the setup on the current site which will do for now. I'll more than likely get your help under a support ticket as I will also have other work Ill need your help with which is integrating Stripe into our e-cart setup. I'll message you on a new post regarding that.
If it works better to keep these separate then thats fine just let me know!