A few years ago, I moved up from my old B+K Precision to a nice new Rigol 1054Z. I've been very happy with the 1054Z and it's only $349 on Amazon. That would be my recommendation for the oscilloscope.
Signal generators are more hit and miss. I have an old wien bridge unit that works acceptably well. It's a TENMA 72-455. But there are many equivalent units available. Just don't fall for the cheap digital ones. They are a pain to sweep and adjust frequency, and usually suffer fairly low output. You also really want one with a big dial that's easy to adjust. Frequency accuracy is not nearly as important as ease of use. Especially since any modern oscilloscope will give you an accurate frequency reading when checking waveforms. But when doing band pass measurements on amplifiers, the big knob just makes the job way easier.
I'd recommend something like this one:
10Hz-1MHz Audio/Low Frequency Signal Generator TAG-101 The exact model isn't quite as important as getting one that has the features you want and reasonably good ratings.
B.t.w... My first signal generator was an old Precision E310 all tube unit with a big 6 inch metal dial on the front. If you can get one and restore it, they are a fun unit to have. But big as a battle ship sitting on the work bench.

And a little microphonic.