Hi there - big hugs to you. No, you have not stuffed things up!!! It's so important to help them sleep independantly, but don't expect too much too soon. He is still little and is just starting to work out this whole napping thing! (babies work out night time sleep first, then at around 3-6months, they work out their daytime sleep). 45min naps are common at this stage.
This link below, is a technique on sh/pt which you can use to calm a baby down. Try this out, but for spirited lo's it can be a little much, you may end up just rubbing and shing instead.
pat/shush intructionsAnother important thing is a windown routine? do you do one? below is a link to some good tips. It's important that you are consistent and do this for every nap and bedtime. Start the windown about 15minutes before his due sleep time (so it's part of the A time). For very spiritied lo's its really improtant that they are calm before they get to sleep
windown routinesOne thing I want you to remember though, is that even though it's a routine, it's not a schedule that has to be adhered to at all costs. YOu still want to listen to what your lo is trying to tell you and follow those cues...also, it's important for you to get out of the house and have a break, even if it is with your lo. try and plan for things in his A time.
As for the cluster feeding effecting the dream feed - all bubs are different. My lo went great on cluster feeding but wouldn't wake for love nor money before 1am. So you may find that you do either, not necessarily both.
I'm also going to get an EASY moderator to come have a look at your routine too, to make sure he is on the right hourly routine. IMO it's ok, but they have more experience than me on those sorts of things.
hope all this helps, and let us know how you go.