I'd keep with the two naps hun if you can and maybe try w2s around 5am? I know this sucks as you might have to set an alarm, but hopefully after a week it may discourage the 6am wu. I've only ever done w2s for naps and it was brilliant, but I've seen on here many have had a good result with it for EW.
Worth a go?
How do I address habitual wakings? (wake-to-sleep and other methods)