Congratulations! I hope you will both be very happy.
You certainly do need a solicitor.
Please take into account, especially if your daughter becomes a joint tenant in your house, how this will affect you, should you need to go into a care home, or indeed if your husband should need to.
Also in the economic crisis facing us all - can you really afford (you and your husband that is) to keep running two properties? And what will happen if either of you need or want later to sell one of the properties?
Please raise these points too with a solicitor.
In your place, I would also discuss the possiblitiy with your fiancé of both of you selling your houses now, retaining enough of the money to buy or rent a smaller house in both your names, and either placing the rest in trust for your heirs, or handing it over now. (You didn't say if he has children.)
I believe, but am not sure that if you place money or a property in trust for your daughter, you cannot claim it if you do divorce, or in the event of your daughter (God forbid!) predeceasing you.
Under Scottish law your present will is still valid after marriage. It is only in England that your will is invalidated upon marriage or re-marriage.