I have combined the gen_random_uuid() and uuidv4() into a single row, as you suggested. Please find the v5 patch, which has been squashed into a single commit.
Regarding the 0001 patch, I think we can put uuidv4() and get_random_uuid() in the same row since they are effectively identical functions. For example, we have precedent such as char_length() and character_length().