Earlier or later bed time

My 5 month old currently goes to bed between 8-9pm (usually closer to 9:30 by the time I get her down). I let her have her last nap and sleep no later than 7 then it’s 2 hours from then and we do our evening routine in that time. I feel like we’ve come out of the regression and she was sleeping a bit better but recently she’s been waking up about 30 mins to an hour after going down then after a quick resettle she’ll sleep again for maybe another hour or 2 then up again and then refuses to go back in her next to me and will only sleep on me or next to me in my bed. She doesn’t always need fed but sometimes will take the boob for comfort. She will pull her legs up and curl over to the side so not sure if it’s a sore tummy but then she stops crying as soon as I pick her up. Is this a sign that she needs an earlier bed time or that I’m trying to put her to bed too early? She also refuses to nap in her next to me and only does contact naps so she doesn’t really associate the next to me with sleep anymore which I think could also be the problem