Thanks for that link, i might give these a try, the connections would definitely be more secure that way. The Yamaha is a classic; powerful, rich and smooth with every tone control options you can imagine. I love it.
No problem. There is a CR-2020 locally for sale but it's $1,720 (Canadian). That's pretty expensive for me. I'd have to sell off my other headphone amps to get that.