Help! 1995 audi 90 quattro won't start

Ok heres the deal,
I bought a used audi 90 2.8 v6 Quattro with about 116,000 miles on it a couple weeks ago and I love it.  But then the starter started acting weird.  Sometimes you would turn the key and the starter would just spin and not engage the flywheel.  Eventually, however, the starter would catch and the car would start.  I read that the starter solenoid starts to go and then the starter starts to have problems engaging so I thought that was the problem.  But today I went to start the car and nothing happend.  The starter didn't engage at all (lucky it's a standard and I could pop start it).  I'm assuming I need a new starter.  But I heard the the ignition switches also like to break on these cars all the time.  Once I pop start it, the car runs and drives like normal.  Does this sound like the ignition switch, the starter, or both?

P.S. If it's the starter, how the heck do I get it out?  It's really crowded up in there!!

Thanks a lot