An inexpensive preamp is not worth the trouble IME. I think your second choice is the better one. For example, you should be able to get a Moon integrated for your budget plus the resale on the 352.
And of course there are other choices; it seems to me that given your musical tastes you would enjoy tubes, as long as your speakers don't present wide impedance variations with frequency.
And of course there are other choices; it seems to me that given your musical tastes you would enjoy tubes, as long as your speakers don't present wide impedance variations with frequency.