22″ radius track is pretty much limited to just curves as you have discovered. A #8 switch is fairly close to a 22″ radius but you won’t be able to just drop in place of a 22″ radius curved piece like you would an Atlas snap switch with a 18″ curve.

The Peco track brand (out of the UK) does have actual curved switches which may solve your problem but putting curved switches may be a source of headaches due to their tendency to cause derailments. I suggest that write or e-mail Atlas and Peco to see if they have any suggestions as to what type of switches they have to solve your problem.

As far as curved rerailer/terminal section, Atlas offers terminal wires soldered directly to a pair of rail joiners so you don’t have the unsightly (in my opinion) lump of plastic and screws sticking out of the side of the track to hook your power supply to. If you have any soldering experience, you can easily make your own. If you are looking for just a curved rerailer, I think you are out of luck.

To get to some of the track items I have mentioned try:

http://www.modeltrainstuff.com

They have an excellent selection and their prices are very good.

Hope this helps,

Geof