I suggest both.

I like to keep my PCT simple as possible. For a cycle like yours I'd do this:

Starting 3 days after your last prop shot:

Clomid @ 100mg ED 4 weeks
Nolvadex @ 20mg ED 4 weeks