If you can come up with a good block that only needs one or two sleeves to fix, I would go for it. There is no way a gen 3 will match the power per $$ considering you will take a bath on what you have, plus you will have to buy gen 3 stuff.
Keep looking for a good 400, with the loss on your current parts in mind!