Following your instincts is the best way to go. You cannot spoil a baby, especially by giving them positive attention! It's what more babies need, rather than being ignored. It makes them feel secure and confident little people.
My bubba is nearly 1 and I still feed him to sleep. It's easy, involves no crying and he settles quickly.
He also knows that day and night sleeps are different, so I wouldn't worry about it stuffing up his evening pattern.
Go, and trust your heart!