Restore 4.0.1, JB iP4 with SHSH saved

[turncoat]

Sorry, yes i searched. Don't have a solid answer.

For the record,

• I have an iPhone 4, FW 4.0.1 JB with jailbreakme.
• I have SHSH saved for 4.0.1, 4.0.2, 4.1, and 4.2b3.
• I have OSX 10.6.

I need:

• to restore FW and rebuild again, with JB 4.0.1 or 4.1. Too many things in cydia crashing to figure this one out right now.
• to keep my BB at 1.59, preferred. I am activated already with my subscribed carrier, but when i go the the US i pop my gophone SIM in, I'd like to keep my unlock.

If i restore to 4.0.1, should I just option-restore to a downloaded 4.0.1 IPSW, with a modified hosts file? and then use Tiny Umbrella to kick me out of recovery? or will iTunes not let me do a restore with my old 1.59 BB?

If I go to 4.1, I need to use pwnage tool then? Does pwnage work for 4.0.1?

Thanks for any knowledgeable replies. Things are moving too fast in iPhone JB land for me to keep up.

**********************

ok edit:

I think this answers my first question:
iPhone 4 4.1 (8B117) 01.59.00 Help Advice - Which JB method?
so I can restore to 4.0.1.

But still, should I use pwnage tool to go to 4.1? and/or does it work with 4.0.1?