Being frugal ourselves the obvious choice for us is repair what you have. The only reason to have an RV is to be mobile, a prefab unit is cheaper and better constructed for the long haul, there are plenty of used and repossessed units on the market where they include delivery and set-up.
We have a ranch that we are looking to do the same, we have 33' TT toyhauler there currently but it doesn't cut the mustard for truly comfortable long term stays, will be used as extra sleeping quarters and storage for ATVs/UTVs once we get prefab delivered.
Whether now or in the past, with very few exceptions, RVs are constructed as fast as they can push them out the door, pandemic hasn't changed much in that respect. Plenty of new RVs on the lots in ABQ area, although I prefer buying gently used, last July found a creampuff class A.