Hey there sweetie,
Huge hugs to you, you must be completely exhausted.....
....ok devils advocate here, well done for weaning him from feeding to sleep that is a huge accomplishment, but it sounds to me like you are still a prop for your LO. I guess what you need to ask yourself is, do you want to co-sleep? Is this something you and your partner would be ok with?
If not then I would set up a matress in your LOs room on the floor and I would stop bringing him to your bed, no exceptions, while you are weaning him off you. I would also be checking for teeth because they completely muck up naps and can cause a LOT of night wakings!! If you suspect their are teeth at play, you may want to try giving him a dose of paracetamol at bed time, it may help him to settle back down on his own when he wakes. I find our LO when teething (has reflux too but that's another story) sleeps great for about three hours and then when comes into his light sleep phase rouses and cries, then continues to do it every couple of hours or so...he is bringing a lot of molars up though poor darling!!
Hmm my LO if he wakes at 30 minutes on the dot means he is OT, but you say that yours is waking at 25 minutes....does your LO suffer from wind or reflux at all? The fact that your LO will only sleep for about 40 minutes tends to suggest that he is a bit under tired although the A times look pretty good to me, perhaps you could try extending it by 10 minutes or so and see if that helps keep him down a little longer? Sounds like he is doing about one sleep cycle then completely rousing rather than settling back down to sleep (hence the wind/reflux question)...Is he self settling for these naps?
I also think I would try cutting out that cat nap in the afternoon and bringing bed time forwards a bit....I'm not an expert, but sometimes the cat nap can really impact on the night sleeping (especially the settling and first half of the night I think)...
How is your LO going on solids? Do you think he NEEDS a dream feed and a feed during the night, is it habitual waking (same time every night)? Have you tried just comforting to see if he will go down without feeding? I breastfed till our LO was 12 months or so (also because of reflux) so I'm not trying to promote weaning or anything, but I'm thinking that having a dream feed AND a feed at 3ish seems rather a lot for this age??
Hmm, sorry I can't be more help. Sure the mods will give you great advice and I"ll be very interested to read what they have to say, big hugs to you
xx hang in there
Lizzie