yes, the hammer bonus is for all AP-religion buildings (that aren't obsolete), regardless of whether it's your state religion. it probably does go away while you're being all defiant and stuff. statue of liberty + angkor wat + AP religion temple ends up giving you 4

+ 1

every turn for free! add OR and a forge for extra goodness.
i've never defied a resolution, so i don't know when the

goes away from experience. i've seen most people say that it doesn't go away until you vote for a resolution that passes.
if that's the
only way to get it to go away that seems
terrible design to me. all the Resident or SecG has to do is not put any more resolutions up for vote, and you're screwed for eternity! and they
always have the option to not put anything up for a vote, until it's time for re-election. maybe i'm the only one to think of such an evil scheme? anyway...
i found this in another thread about the

villain penalty:
Its 20 turns (on normal) so 60 on Marathon... Very long
so maybe it goes away when you vote yes or 20 turns (adjusted for speed), whichever comes first? Krikkitone reads the code, and has been a reliable source for me in the past, so i don't think he's making that up. but i don't read code so i can't point to anything except forum searches

.
i do know that the penalties stack if you defy more than one resolution. i'd guess that the timer starts over if you do that, like the whip-anger timer does.