Nothing much to add but I could have written your post.
Toby's the same age and does everything your little guy is doing, exactly. I've always said I'd let him self wean but I can't see it happening for a long time so I'm kind of rethinking that plan. He is still very much into it.
If you're still feeding that frequently it's not surprising your AF hasn't come back yet - I only got mine back last month. It's nothing to worry about because while he's still feeding around the clock it will generally stay away.
Mine only came back because for about a month Toby was sleeping through....didn't last long lol.