Jailbreaking my iPhone 3GS...will this work?

I downgraded my baseband on my iPhone 3GS from 06.15.00 so now I have 05.13.04 on my thethered unlocked 5.1 iPhone. But I need a phone that will be both jailbroken untethered and unlocked.

Now that I don't have the iPad baseband, will I be able to do this just by upgrading normally with iTunes to 5.1.1, then jailbreaking with redsn0w, then unlock with ultrasn0w? Or am I missing a step?

On a side note, if there's anyway I can stick to 5.1 but have it untethered, that would be great.

eli manning eli manning kelly clarkson national anthem halftime show super bowl halftime show 2012 ahmad bradshaw tom brady