hey there, sorry to be slow to respond.
I have a few general resources for you as far as optimizing your build goes:
one thing we can also do is bump your deploy time up to 30 mins if you have a credit card on file. would that be helpful? that way you can at least deploy for now.