Blind Willie possibly rewrote it and might have even added the chorus, but the verses were printed in upmarket songsters in the second half of the 18thc and by 1800 there were widely differing versions being printed with as many as 10 verses. Willie's version only appears to have 5.
Here's a 5 verse version from the Bacchanalian Songster printed by B. Wickes of Winchester in 1783.
I'll have a wife, Whatso'er she be; If she be but woman, That's enough for me.
If she should be handsome, Oh! what a delight; If she should be ugly, What matter in the night?
Should she be good humour'd, Oh! what joys are there; Should she be ill-natur'd, Hang me if I care.
If she should be barren, Then the less my care; If she should be fruitful, Then I'll have an heir.
Should she be an angel, Then I shan't be curst; Should she be a devil, Hang her do her worst.
(No ref to besoms)
Burns had 2 versions, one obviously from tradition but the other looks to have come from his own pen.