Is it wrong to use rwan with gyda fi?
Not grammatically wrong but very unnatural, rŵan is only used with North Wales sentences.
That's been corrected, thanks for the comment.
can we use 'erbyn hyn' for now?
Yes, that's a good suggestion in this context. That's added now.
I do like the meaning and how it sounds.