you can do it either way with nolva. I use it full cycle but I have my reasons. You could just hang on to it in case. Just remember Gyno is no joke so have nolva on hand. The clomid is a very weak anti Estro. Its main use is to help bring natural test production back to normal post cycle.
Yes you can switch test. If you can stick with a single long ester.