Try not to worry too much about creating bad habits, especially regarding feeding to sleep. Easier said than done I know, but I used to worry about it and I wish I hadn't.
Dd always used to feed to sleep, and nap on me, until she was about 3 or 4 months old. Then gradually it just stopped working. Things became difficult for a while and she would only nap in the pram.
At around 5 months, when she became very distractible while feeding, I started to feed her in bed, lying down. Then when she had finished feeding I stayed there, lying next to her (being as boring as possible)until she fell asleep. It didn't always work and so if she got upset I would cuddle her and start again (or get the pram out!). Once she was asleep I would sneak off downstairs and leave her asleep on the bed. (I recommend blackouts, white noise and soft music.)
Once she had learned to roll I would move her into her cot after she'd fallen asleep. Sometimes this woke her and we had to start again. (very frustrating)
Then one day, (when she was about 7 months I think) while I was lying next to her, I got so annoyed with her pulling at my hair, my nose, my boobs etc, that I picked her up and plonked her in her cot (wide awake) and left the room. Miraculously she self settled within about 5-10 minutes. So that's what I did from then on. The important thing was to leave the room immediately, even if she protested. A bit of grizzling is perfectly ok. If she stayed upset I would always go back in to cuddle her but usually she would just have a shout and then self settle. I actually found that I was distracting her more by being in the room, if that makes sense.
Whether she was just 'ready' to start self settling or whether we 'trained' her to is impossible to say but it worked. At 13 months she now has one lovely 2 hour nap after lunch and sleeps for 12 hours at night. If someone had told me 9 months ago that I would just be able to plonk her in her cot, walk away and she would self settle then I'd never have believed them. and would have wanted to punch them I can honestly say that I miss the feeding to sleep and cuddle naps now.
It sounds like she's doing well for both her naps and overnight. The naps will probably extend beyond one sleep cycle (consistently) at around 6 months and the night feeds will hopefully reduce as well.
Sorry that was so long. I hope some of it is useful.