Now , for me it's the guitar. I guess it always was really, as playing a guitar or any closely held instrument is an intimate act.
The amp now only has the function to bring out the best in the guitar for me. My position was even more consolidated, when I went down the ( long overdue ) Jazz route recently. I practice unplugged about 98% of the time - and the amp when used - is chosen / used to make the guitar sound 'bigger' - not different .
The 'last straw' for me was seeing / hearing a DVD of Joe Pass going D.I. into the front of house P.A. system. Lovely . If anything I would now go acoustic - ( or electro- acoustic ) if I had to chose. Like Philly, I love guitars - but it's about the music to me , it just so happened that I chose the guitar to explore the music on, due to influences at the outset.
I admit that in the interim decades it was about both really. N.O.S. valves in carefully chosen amps e.t.c. But as previously mentioned by another forumite on a recent thread - even that was about presenting the essence of the style / genre in which I was involved ; - which was at the time big 'spanky' Soul & R'n'B ( in the true / real meaning of R'n'B ) - and of course warm, cranked electric Blues.
:)